rename the waypoint class Waypoint per common capitilization convetions courtesy...
authortsteven4@gmail.com <tsteven4@gmail.com@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Wed, 22 Jan 2014 23:39:04 +0000 (23:39 +0000)
committertsteven4@gmail.com <tsteven4@gmail.com@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Wed, 22 Jan 2014 23:39:04 +0000 (23:39 +0000)
git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4723 f51c46e8-681c-474f-0cfe-069cfd0219fb

144 files changed:
gpsbabel/alan.cc
gpsbabel/an1.cc
gpsbabel/arcdist.cc
gpsbabel/bcr.cc
gpsbabel/bend.cc
gpsbabel/brauniger_iq.cc
gpsbabel/bushnell.cc
gpsbabel/bushnell_trl.cc
gpsbabel/cet_util.cc
gpsbabel/compegps.cc
gpsbabel/cst.cc
gpsbabel/csv_util.cc
gpsbabel/defs.h
gpsbabel/delbin.cc
gpsbabel/delgpl.cc
gpsbabel/destinator.cc
gpsbabel/dg-100.cc
gpsbabel/discard.cc
gpsbabel/dmtlog.cc
gpsbabel/duplicate.cc
gpsbabel/easygps.cc
gpsbabel/enigma.cc
gpsbabel/exif.cc
gpsbabel/filterdefs.h
gpsbabel/g7towin.cc
gpsbabel/garmin.cc
gpsbabel/garmin_fit.cc
gpsbabel/garmin_fs.cc
gpsbabel/garmin_fs.h
gpsbabel/garmin_gpi.cc
gpsbabel/garmin_txt.cc
gpsbabel/garmin_xt.cc
gpsbabel/gdb.cc
gpsbabel/geo.cc
gpsbabel/ggv_log.cc
gpsbabel/ggv_ovl.cc
gpsbabel/glogbook.cc
gpsbabel/gnav_trl.cc
gpsbabel/google.cc
gpsbabel/googledir.cc
gpsbabel/gopal.cc
gpsbabel/gpssim.cc
gpsbabel/gpsutil.cc
gpsbabel/gpx.cc
gpsbabel/gtm.cc
gpsbabel/gtrnctr.cc
gpsbabel/gui/gpsbabelfe.ts
gpsbabel/gui/gpsbabelfe_de.ts
gpsbabel/gui/gpsbabelfe_es.ts
gpsbabel/gui/gpsbabelfe_fr.ts
gpsbabel/gui/gpsbabelfe_hu.ts
gpsbabel/gui/gpsbabelfe_it.ts
gpsbabel/gui/gpsbabelfe_ru.ts
gpsbabel/height.cc
gpsbabel/hiketech.cc
gpsbabel/holux.cc
gpsbabel/html.cc
gpsbabel/humminbird.cc
gpsbabel/igc.cc
gpsbabel/ignrando.cc
gpsbabel/igo8.cc
gpsbabel/ik3d.cc
gpsbabel/interpolate.cc
gpsbabel/itracku.cc
gpsbabel/jogmap.cc
gpsbabel/jtr.cc
gpsbabel/kml.cc
gpsbabel/lmx.cc
gpsbabel/lowranceusr.cc
gpsbabel/lowranceusr4.cc
gpsbabel/magellan.h
gpsbabel/maggeo.cc
gpsbabel/magproto.cc
gpsbabel/main.cc
gpsbabel/mapasia.cc
gpsbabel/mapbar_track.cc
gpsbabel/mapsend.cc
gpsbabel/mapsource.cc
gpsbabel/mkshort.cc
gpsbabel/mmo.cc
gpsbabel/mtk_locus.cc
gpsbabel/mtk_logger.cc
gpsbabel/navicache.cc
gpsbabel/naviguide.cc
gpsbabel/navilink.cc
gpsbabel/navilink.h
gpsbabel/navitel.cc
gpsbabel/netstumbler.cc
gpsbabel/nmea.cc
gpsbabel/nmn4.cc
gpsbabel/osm.cc
gpsbabel/overlay.cc
gpsbabel/ozi.cc
gpsbabel/pcx.cc
gpsbabel/pocketfms_bc.cc
gpsbabel/pocketfms_fp.cc
gpsbabel/pocketfms_wp.cc
gpsbabel/polygon.cc
gpsbabel/position.cc
gpsbabel/psitrex.cc
gpsbabel/radius.cc
gpsbabel/random.cc
gpsbabel/raymarine.cc
gpsbabel/reverse_route.cc
gpsbabel/route.cc
gpsbabel/saroute.cc
gpsbabel/sbn.cc
gpsbabel/sbp.cc
gpsbabel/shape.cc
gpsbabel/skyforce.cc
gpsbabel/skytraq.cc
gpsbabel/smplrout.cc
gpsbabel/sort.cc
gpsbabel/stackfilter.cc
gpsbabel/stmsdf.cc
gpsbabel/stmwpp.cc
gpsbabel/subrip.cc
gpsbabel/swapdata.cc
gpsbabel/tef_xml.cc
gpsbabel/teletype.cc
gpsbabel/text.cc
gpsbabel/tiger.cc
gpsbabel/tmpro.cc
gpsbabel/tomtom.cc
gpsbabel/tpg.cc
gpsbabel/tpo.cc
gpsbabel/trackfilter.cc
gpsbabel/transform.cc
gpsbabel/unicsv.cc
gpsbabel/util.cc
gpsbabel/v900.cc
gpsbabel/validate.cc
gpsbabel/vcf.cc
gpsbabel/vidaone.cc
gpsbabel/vitosmt.cc
gpsbabel/vitovtt.cc
gpsbabel/vpl.cc
gpsbabel/waypt.cc
gpsbabel/wbt-200.cc
gpsbabel/wfff_xml.cc
gpsbabel/wintec_tes.cc
gpsbabel/xcsv.cc
gpsbabel/xol.cc
gpsbabel/yahoo.cc

index 661b416a85420e453cac3d3b0891b1a112665149..1b83abc15df609240f4cce3e791e42bd2244bb8a 100644 (file)
@@ -493,12 +493,12 @@ static time_t unpack_time(int32_t date, int32_t time)
 
 /**************************************************************************/
 
-static waypoint* get_wpt(struct wprdata* wprdata, unsigned n)
+static Waypoint* get_wpt(struct wprdata* wprdata, unsigned n)
 {
   struct wpthdr* wpthdr;
   struct wpt* wpt;
   int j, idx;
-  waypoint* WP;
+  Waypoint* WP;
 
   wpthdr = &(wprdata->wpthdr);
   idx = wpthdr->idx[n];
@@ -508,7 +508,7 @@ static waypoint* get_wpt(struct wprdata* wprdata, unsigned n)
   }
   wpt = &(wprdata->wpt[idx]);
 
-  WP = new waypoint;
+  WP = new Waypoint;
   WP->latitude  = -pt2deg(wpt->pt.y);
   WP->longitude =  pt2deg(wpt->pt.x);
   WP->SetCreationTime(unpack_time(wpt->date, wpt->time));
@@ -535,7 +535,7 @@ static void wpr_read(void)
   struct rtehdr* rtehdr;
   struct rte* rte;
   int i, j, idx;
-  waypoint* WP;
+  Waypoint* WP;
   route_head* RT;
 
   if (gbfread(&wprdata, sizeof(struct wprdata), 1, fin) != 1) {
@@ -596,7 +596,7 @@ static void trl_read(void)
   struct trldata trldata;
   struct trkhdr* trkhdr;
   struct trklog* trklog;
-  waypoint* WP;
+  Waypoint* WP;
   route_head* TL;
   int i, j;
 
@@ -643,7 +643,7 @@ static void trl_read(void)
     /* track points */
     trklog = &(trldata.trklog[i]);
     for (j=0; j<trkhdr->totalpt; j++) {
-      WP = new waypoint;
+      WP = new Waypoint;
       WP->latitude  = -pt2deg(trklog->pt[j].y);
       WP->longitude =  pt2deg(trklog->pt[j].x);
       WP->altitude  =  hgt2m(trklog->sh[j].height);
@@ -659,7 +659,7 @@ static void trl_read(void)
 
 /**************************************************************************/
 
-static int find_wpt(struct wprdata* wprdata, const waypoint* WP)
+static int find_wpt(struct wprdata* wprdata, const Waypoint* WP)
 {
   struct wpt pattern, *wpt;
   int i, wpt_idx;
@@ -685,7 +685,7 @@ static int find_wpt(struct wprdata* wprdata, const waypoint* WP)
   return -1;
 }
 
-static int add_wpt(struct wprdata* wprdata, const waypoint* WP,int isroute)
+static int add_wpt(struct wprdata* wprdata, const Waypoint* WP,int isroute)
 {
   struct wpthdr* wpthdr;
   int hdr_idx, wpt_idx;
@@ -733,7 +733,7 @@ static int add_wpt(struct wprdata* wprdata, const waypoint* WP,int isroute)
   return hdr_idx;
 }
 
-static void wpr_waypoint(const waypoint* WP)
+static void wpr_waypoint(const Waypoint* WP)
 {
   add_wpt(&WPR, WP, 0);
 }
@@ -771,7 +771,7 @@ static void wpr_route_hdr(const route_head* RT)
   /* rtehdr->rteno = rte_idx; */
 }
 
-static void wpr_route_wpt(const waypoint* WP)
+static void wpr_route_wpt(const Waypoint* WP)
 {
   struct rte* rte;
   int wpt_idx;
@@ -860,7 +860,7 @@ static void trl_track_hdr(const route_head* TL)
   TRL.loghdr.num = idx;
 }
 
-static void trl_track_wpt(const waypoint* WP)
+static void trl_track_wpt(const Waypoint* WP)
 {
   struct trklog* trklog;
   struct trkhdr* trkhdr;
index b9e51ad217f742d08774a2108a41c544044d4087..f13fc2b71814cf832d0cb21680ce7b53c6014f1e 100644 (file)
@@ -692,14 +692,14 @@ static void Read_AN1_Waypoints(gbfile* f)
   unsigned long count = 0;
   unsigned long i = 0;
   an1_waypoint_record* rec = NULL;
-  waypoint* wpt_tmp;
+  Waypoint* wpt_tmp;
   char* icon = NULL;
   ReadShort(f);
   count = ReadLong(f);
   for (i = 0; i < count; i++) {
     rec = Alloc_AN1_Waypoint();
     Read_AN1_Waypoint(f, rec);
-    wpt_tmp = new waypoint;
+    wpt_tmp = new Waypoint;
 
     if (rec->creation_time) {
       wpt_tmp->SetCreationTime(rec->creation_time);
@@ -736,7 +736,7 @@ static void Read_AN1_Waypoints(gbfile* f)
 }
 
 static void
-Write_One_AN1_Waypoint(const waypoint* wpt)
+Write_One_AN1_Waypoint(const Waypoint* wpt)
 {
   an1_waypoint_record* rec;
   int local;
@@ -847,7 +847,7 @@ static void Read_AN1_Lines(gbfile* f)
   an1_line_record* rec = NULL;
   an1_vertex_record* vert = NULL;
   route_head* rte_head;
-  waypoint* wpt_tmp;
+  Waypoint* wpt_tmp;
 
   ReadShort(f);
   count = ReadLong(f);
@@ -874,7 +874,7 @@ static void Read_AN1_Lines(gbfile* f)
       Read_AN1_Vertex(f, vert);
 
       /* create route point */
-      wpt_tmp = new waypoint;
+      wpt_tmp = new Waypoint;
       wpt_tmp->latitude = DecodeOrd(vert->lat);
       wpt_tmp->longitude = -DecodeOrd(vert->lon);
       wpt_tmp->shortname = QString().sprintf("\\%5.5lx", rtserial++);
@@ -1005,7 +1005,7 @@ Write_One_AN1_Line(const route_head* rte)
 }
 
 static void
-Write_One_AN1_Vertex(const waypoint* wpt)
+Write_One_AN1_Vertex(const Waypoint* wpt)
 {
   an1_vertex_record* rec;
   int local;
index 83bf867e25a2bd5bd14c471bc603045c5ebe372e..b8d023b464911c2dcd88ba33f75aa39b6abd88b5 100644 (file)
@@ -41,7 +41,7 @@ typedef struct {
   double distance;
   double prjlatitude, prjlongitude;
   double frac;
-  waypoint* arcpt1, * arcpt2;
+  Waypoint* arcpt1, * arcpt2;
 } extra_data;
 
 static
@@ -80,23 +80,23 @@ arglist_t arcdist_args[] = {
 #define BADVAL 999999
 
 static void
-arcdist_arc_disp_wpt_cb(const waypoint* arcpt2)
+arcdist_arc_disp_wpt_cb(const Waypoint* arcpt2)
 {
   queue* elem, * tmp;
-  waypoint* waypointp;
+  Waypoint* waypointp;
   extra_data* ed;
   double dist;
   double prjlat, prjlon, frac;
-  static waypoint* arcpt1 = NULL;
+  static Waypoint* arcpt1 = NULL;
 
   if (arcpt2 && arcpt2->latitude != BADVAL && arcpt2->longitude != BADVAL &&
       (ptsopt || (arcpt1 &&
                   (arcpt1->latitude != BADVAL && arcpt1->longitude != BADVAL)))) {
 #if NEWQ
-    foreach(waypoint* waypointp, waypt_list) {
+    foreach(Waypoint* waypointp, waypt_list) {
 #else
     QUEUE_FOR_EACH(&waypt_head, elem, tmp) {
-      waypointp = (waypoint*) elem;
+      waypointp = (Waypoint*) elem;
 #endif
       if (waypointp->extra_data) {
         ed = (extra_data*) waypointp->extra_data;
@@ -133,14 +133,14 @@ arcdist_arc_disp_wpt_cb(const waypoint* arcpt2)
             ed->prjlongitude = prjlon;
             ed->frac = frac;
             ed->arcpt1 = arcpt1;
-            ed->arcpt2 = (waypoint*) arcpt2;
+            ed->arcpt2 = (Waypoint*) arcpt2;
           }
         }
         waypointp->extra_data = ed;
       }
     }
   }
-  arcpt1 = (waypoint*) arcpt2;
+  arcpt1 = (Waypoint*) arcpt2;
 }
 
 static void
@@ -160,12 +160,12 @@ arcdist_process(void)
     int fileline = 0;
     char* line;
     gbfile* file_in;
-    waypoint* arcpt2, * arcpt1;
+    Waypoint* arcpt2, * arcpt1;
 
     file_in = gbfopen(arcfileopt, "r", MYNAME);
 
-    arcpt1 = new waypoint;
-    arcpt2 = new waypoint;
+    arcpt1 = new Waypoint;
+    arcpt2 = new Waypoint;
     arcdist_arc_disp_hdr_cb(NULL);
 
     arcpt2->latitude = arcpt2->longitude = BADVAL;
@@ -189,7 +189,7 @@ arcdist_process(void)
       if (argsfound != 2 && strspn(line, " \t\n") < strlen(line)) {
         warning(MYNAME ": Warning: Arc file contains unusable vertex on line %d.\n", fileline);
       } else {
-        waypoint* arcpttmp = arcpt1;
+        Waypoint* arcpttmp = arcpt1;
         arcdist_arc_disp_wpt_cb(arcpt2);
         arcpt1 = arcpt2;
         arcpt2 = arcpttmp;
@@ -207,10 +207,10 @@ arcdist_process(void)
 
   removed = 0;
 #if NEWQ
-  foreach(waypoint* wp, waypt_list) {
+  foreach(Waypoint* wp, waypt_list) {
 #else
   QUEUE_FOR_EACH(&waypt_head, elem, tmp) {
-    waypoint* wp = (waypoint*) elem;
+    Waypoint* wp = (Waypoint*) elem;
 #endif
     extra_data* ed;
     ed = (extra_data*) wp->extra_data;
index 18a3e073d1ee241d61806ac19845190de012c2a9..f76b383ecef52117966a09d084dd5f0d47b9d10d 100644 (file)
@@ -126,7 +126,7 @@ bcr_icon_mapping_t bcr_icon_mapping[] = {
 };
 
 static void
-bcr_handle_icon_str(const char* str, waypoint* wpt)
+bcr_handle_icon_str(const char* str, Waypoint* wpt)
 {
   bcr_icon_mapping_t* m;
 
@@ -214,11 +214,11 @@ bcr_rd_deinit(void)
 static void
 bcr_create_waypts_from_route(route_head* route)
 {
-  waypoint* wpt;
+  Waypoint* wpt;
   queue* elem, *tmp;
 
   QUEUE_FOR_EACH(&route->waypoint_list, elem, tmp) {
-    wpt = new waypoint(*(waypoint*) elem);
+    wpt = new Waypoint(*(Waypoint*) elem);
     waypt_add(wpt);
   }
 }
@@ -275,7 +275,7 @@ bcr_data_read(void)
     char station[32];
     char* str;
     int mlat, mlon;            /* mercator data */
-    waypoint* wpt;
+    Waypoint* wpt;
 
     snprintf(station, sizeof(station), "STATION%d", index);
     if (NULL == (str = inifile_readstr(ini, "coordinates", station))) {
@@ -286,7 +286,7 @@ bcr_data_read(void)
       fatal(MYNAME ": structure error at %s (Coordinates)!\n", station);
     }
 
-    wpt = new waypoint;
+    wpt = new Waypoint;
 
     wpt->shortname = station;
     bcr_mercator_to_wgs84(mlat, mlon, &wpt->latitude, &wpt->longitude);
@@ -358,7 +358,7 @@ bcr_route_trailer(const route_head* rte)
 }
 
 static void
-bcr_write_wpt(const waypoint* wpt)
+bcr_write_wpt(const Waypoint* wpt)
 {
 }
 
@@ -384,7 +384,7 @@ static void
 bcr_route_header(const route_head* route)
 {
   queue* elem, *tmp;
-  waypoint* wpt;
+  Waypoint* wpt;
   QString sout;
   int i, north, east, nmin, nmax, emin, emax;
 
@@ -411,7 +411,7 @@ bcr_route_header(const route_head* route)
   i = 0;
   QUEUE_FOR_EACH(&route->waypoint_list, elem, tmp) {
     const char* icon;
-    waypoint* wpt = (waypoint*) elem;
+    Waypoint* wpt = (Waypoint*) elem;
 
     i++;
 
@@ -429,7 +429,7 @@ bcr_route_header(const route_head* route)
   i = 0;
   QUEUE_FOR_EACH(&route->waypoint_list, elem, tmp) {
     i++;
-    wpt = (waypoint*) elem;
+    wpt = (Waypoint*) elem;
 
     bcr_wgs84_to_mercator(wpt->latitude, wpt->longitude, &north, &east);
 
@@ -457,7 +457,7 @@ bcr_route_header(const route_head* route)
     QString s1, s2;
 
     i++;
-    wpt = (waypoint*) elem;
+    wpt = (Waypoint*) elem;
     s1 = wpt->notes;
     if (s1.isEmpty()) {
       s1 = wpt->description;
index 82861221261f6962ba1404909979462f792ee937..290d248a82e10dbcda87dfea432089226c7e37ce 100644 (file)
@@ -70,8 +70,8 @@ bend_init(const char* args)
   route_flush_all_routes();
 }
 
-static waypoint*
-create_wpt_dest(const waypoint* wpt_orig, double lat_orig,
+static Waypoint*
+create_wpt_dest(const Waypoint* wpt_orig, double lat_orig,
                 double long_orig, double lat_orig_adj, double long_orig_adj)
 {
   double distance = gcdist(lat_orig, long_orig,
@@ -79,7 +79,7 @@ create_wpt_dest(const waypoint* wpt_orig, double lat_orig,
   double frac;
   double lat_dest;
   double long_dest;
-  waypoint* wpt_dest = NULL;
+  Waypoint* wpt_dest = NULL;
   distance = radtometers(distance);
   if (distance <= maxDist) {
     return NULL;
@@ -90,7 +90,7 @@ create_wpt_dest(const waypoint* wpt_orig, double lat_orig,
   linepart(lat_orig, long_orig, lat_orig_adj, long_orig_adj, frac,
            &lat_dest, &long_dest);
 
-  wpt_dest = new waypoint(*wpt_orig);
+  wpt_dest = new Waypoint(*wpt_orig);
   wpt_dest->latitude = DEG(lat_dest);
   wpt_dest->longitude = DEG(long_dest);
 
@@ -117,16 +117,16 @@ is_small_angle(double lat_orig, double long_orig, double lat_orig_prev,
 static void
 process_route(const route_head* route_orig, route_head* route_dest)
 {
-  waypoint* wpt_orig_prev = NULL;
-  waypoint* wpt_orig = NULL;
+  Waypoint* wpt_orig_prev = NULL;
+  Waypoint* wpt_orig = NULL;
 
   queue* elem, *tmp;
   QUEUE_FOR_EACH(&route_orig->waypoint_list, elem, tmp) {
-    waypoint* wpt_orig_next = (waypoint*)elem;
+    Waypoint* wpt_orig_next = (Waypoint*)elem;
 
     if (wpt_orig_prev == NULL) {
       if (wpt_orig != NULL) {
-        waypoint* waypoint_dest = new waypoint(*wpt_orig);
+        Waypoint* waypoint_dest = new Waypoint(*wpt_orig);
         route_add_wpt(route_dest, waypoint_dest);
       }
     } else {
@@ -138,14 +138,14 @@ process_route(const route_head* route_orig, route_head* route_dest)
 
       double lat_orig_next = RAD(wpt_orig_next->latitude);
       double long_orig_next = RAD(wpt_orig_next->longitude);
-      waypoint* wpt_dest_next = NULL;
+      Waypoint* wpt_dest_next = NULL;
 
       if (is_small_angle(lat_orig, long_orig, lat_orig_prev,
                          long_orig_prev, lat_orig_next, long_orig_next)) {
-        waypoint* waypoint_dest = new waypoint(*wpt_orig);
+        Waypoint* waypoint_dest = new Waypoint(*wpt_orig);
         route_add_wpt(route_dest, waypoint_dest);
       } else {
-        waypoint* wpt_dest_prev = create_wpt_dest(wpt_orig,
+        Waypoint* wpt_dest_prev = create_wpt_dest(wpt_orig,
                                   lat_orig, long_orig, lat_orig_prev, long_orig_prev);
         if (wpt_dest_prev != NULL) {
           route_add_wpt(route_dest, wpt_dest_prev);
@@ -166,7 +166,7 @@ process_route(const route_head* route_orig, route_head* route_dest)
   }
 
   if (wpt_orig != NULL) {
-    waypoint* waypoint_dest = new waypoint(*wpt_orig);
+    Waypoint* waypoint_dest = new Waypoint(*wpt_orig);
     route_add_wpt(route_dest, waypoint_dest);
   }
 }
index b96d160b7f019653c286e52caa075f21c5b8d06c..aa76cef7de0ae01fd32ed9e3b8fb7414b6876646 100644 (file)
@@ -84,7 +84,7 @@ static int process_data(const unsigned char* data)
   static route_head* track;
   static unsigned char interval;
   time_t finish;
-  waypoint* wpt = NULL;
+  Waypoint* wpt = NULL;
   int i;
 
   if (global_opts.debug_level >= 3) {
@@ -200,7 +200,7 @@ static int process_data(const unsigned char* data)
     break;
 
   case st_sample_alt:
-    wpt = new waypoint;
+    wpt = new Waypoint;
     wpt->latitude = wpt->longitude = 0.0;
     wpt->SetCreationTime(creation);
     creation += interval;
index 856b6b0e05c53a22d82ea4d8eb44c77d9f3feb52..ce71d63b9e04ef3524ca814171e0097d2ad1fdb2 100644 (file)
@@ -205,7 +205,7 @@ bushnell_read(void)
   int32_t lat_tmp,lon_tmp;
   unsigned int proximity;
   unsigned int icon;
-  waypoint* wpt_tmp = new waypoint;
+  Waypoint* wpt_tmp = new Waypoint;
 
   lat_tmp = gbfgetint32(file_in);
   lon_tmp = gbfgetint32(file_in);
@@ -225,7 +225,7 @@ bushnell_read(void)
 }
 
 static void
-bushnell_write_one(const waypoint* wpt)
+bushnell_write_one(const Waypoint* wpt)
 {
   char tbuf[20]; // 19 text bytes + null terminator.
   char padding[2] = {0, 0};
index 26370d190192233221678ccf797135fed4f3af04..e13eaccf583f05b4444ffc71c413b4f4973426c9 100644 (file)
@@ -97,7 +97,7 @@ bushnell_read(void)
   int lat_tmp,lon_tmp;
 
   while (1) {
-    waypoint* wpt_tmp;
+    Waypoint* wpt_tmp;
 
     lat_tmp = gbfgetint32(file_in);
     lon_tmp = gbfgetint32(file_in);
@@ -106,7 +106,7 @@ bushnell_read(void)
       break;
     }
 
-    wpt_tmp = new waypoint;
+    wpt_tmp = new Waypoint;
     wpt_tmp->latitude  = lat_tmp / 10000000.0;
     wpt_tmp->longitude = lon_tmp / 10000000.0;
 
@@ -115,7 +115,7 @@ bushnell_read(void)
 }
 
 static void
-bushnell_write_one(const waypoint* wpt)
+bushnell_write_one(const Waypoint* wpt)
 {
   int32_t lat = wpt->latitude  * 10000000.0;
   int32_t lon = wpt->longitude * 10000000.0;
index 225fecb519bf86a336634b99644acf8f0551b4f1..b89c26edd41b952dec7f04aed02cbb620f57c034 100644 (file)
@@ -913,9 +913,9 @@ cet_convert_init(const char* cs_name, const int force)
 /* -------------------------------------------------------------------- */
 
 static void
-cet_flag_waypt(const waypoint* wpt)
+cet_flag_waypt(const Waypoint* wpt)
 {
-  ((waypoint*)(wpt))->wpt_flags.cet_converted = 1;
+  ((Waypoint*)(wpt))->wpt_flags.cet_converted = 1;
 }
 
 static void
@@ -982,9 +982,9 @@ cet_convert_string(const QString& str)
 /* cet_convert_waypt: internal used within cet_convert_strings process */
 
 static void
-cet_convert_waypt(const waypoint* wpt)
+cet_convert_waypt(const Waypoint* wpt)
 {
-  waypoint* w = (waypoint*)wpt;
+  Waypoint* w = (Waypoint*)wpt;
   format_specific_data* fs;
 
   if ((cet_output == 0) && (w->wpt_flags.cet_converted != 0)) {
index ca3f82e7253a8d0f296b02a9326d088190977d98..758c1c33932ed9ef77a77b7c7a9250321dbbfe10 100644 (file)
@@ -155,12 +155,12 @@ compegps_parse_time(const char* c, struct tm* tm)
 
 /* specialized readers */
 
-static waypoint*
+static Waypoint*
 parse_wpt(char* buff)
 {
   int col = -1;
   char* c, *cx;
-  waypoint* wpt = new waypoint;
+  Waypoint* wpt = new Waypoint;
   struct tm tm;
   int has_time = 0;
   memset(&tm, 0, sizeof(tm));
@@ -229,7 +229,7 @@ parse_wpt(char* buff)
 }
 
 static void
-parse_wpt_info(const char* buff, waypoint* wpt)                /* "w" */
+parse_wpt_info(const char* buff, Waypoint* wpt)                /* "w" */
 {
   char* c;
   int col = -1;
@@ -272,13 +272,13 @@ parse_wpt_info(const char* buff, waypoint* wpt)           /* "w" */
   }
 }
 
-static waypoint*
+static Waypoint*
 parse_trkpt(char* buff)
 {
   int col = -1;
   char* c;
   struct tm tm;
-  waypoint* wpt = new waypoint;
+  Waypoint* wpt = new Waypoint;
 
   c = strstr(buff, "A ");
   if (c == buff) {
@@ -396,7 +396,7 @@ compegps_data_read(void)
   char* buff;
   int line = 0;
   int input_datum;
-  waypoint* wpt = NULL;
+  Waypoint* wpt = NULL;
   route_head* route = NULL;
   route_head* track = NULL;
 
@@ -478,7 +478,7 @@ compegps_data_read(void)
 /* ----------------------------------------------------------- */
 
 static void
-write_waypt_cb(const waypoint* wpt)
+write_waypt_cb(const Waypoint* wpt)
 {
   QString name;
 
@@ -548,7 +548,7 @@ write_track_hdr_cb(const route_head* trk)
 }
 
 static void
-write_trkpt_cb(const waypoint* wpt)
+write_trkpt_cb(const Waypoint* wpt)
 {
   char buff[128];
 
index cda0949fee83da76654d1668736622c5a11a291b..f5f1f06308d7b10d37e7abec4bf8dbdb06a8c0a7 100644 (file)
@@ -52,14 +52,14 @@ arglist_t cst_args[] = {
 /* helpers */
 
 static void
-cst_add_wpt(const route_head* track, waypoint* wpt)
+cst_add_wpt(const route_head* track, Waypoint* wpt)
 {
   if ((wpt == NULL) || (track == NULL)) {
     return;
   }
 
   if (wpt->shortname != NULL) {
-    waypt_add(new waypoint(*wpt));
+    waypt_add(new Waypoint(*wpt));
     // Rather than creating a new waypt on each read, tis format bizarrely
     // recycles the same one, relying on new waypoint(*) above and then manually
     // resetting fields.  Weird.
@@ -69,9 +69,9 @@ cst_add_wpt(const route_head* track, waypoint* wpt)
       temp_route = route_head_alloc();
       route_add_head(temp_route);
     }
-    route_add_wpt(temp_route, new waypoint(*wpt));
+    route_add_wpt(temp_route, new Waypoint(*wpt));
   }
-  track_add_wpt((route_head*)track, (waypoint*)wpt);
+  track_add_wpt((route_head*)track, (Waypoint*)wpt);
 }
 
 static char*
@@ -164,7 +164,7 @@ cst_data_read(void)
   int cst_version;
   int cst_points = -1;
   route_head* track = NULL;
-  waypoint* wpt = NULL;
+  Waypoint* wpt = NULL;
 
   while ((buff = gbfgetstr(fin))) {
     char* cin = buff;
@@ -266,7 +266,7 @@ cst_data_read(void)
         wpt = NULL;
 
 
-        wpt = new waypoint;
+        wpt = new Waypoint;
 
         if (5 != sscanf(cin, "%lf %lf %lf %d %s",
                         &wpt->longitude,
index df8e1702ceaf6eff4b76e086ddae0b988385f9b0..e4b37dbf755c06463fa11fbb9c1b73e188c76655 100644 (file)
@@ -522,7 +522,7 @@ ddmmdir_to_degrees(const char* ddmmdir)
 
 /*****************************************************************************
  * human_to_dec() - convert a "human-readable" lat and/or lon to decimal
- * usage: human_to_dec( "N 41° 09.12' W 085° 09.36'", &lat, &lon );
+ * usage: human_to_dec( "N 41� 09.12' W 085� 09.36'", &lat, &lon );
  *        human_to_dec( "41 9 5.652 N", &lat, &lon );
  *
  *        which: 0-no preference    1-prefer lat    2-prefer lon
@@ -991,7 +991,7 @@ time_to_yyyymmdd(QDateTime t)
 }
 
 static garmin_fs_t*
-gmsd_init(waypoint* wpt)
+gmsd_init(Waypoint* wpt)
 {
   garmin_fs_t* gmsd = GMSD_FIND(wpt);
   if (gmsd == NULL) {
@@ -1006,7 +1006,7 @@ gmsd_init(waypoint* wpt)
 /* usage: xcsv_parse_val("-123.34", *waypt, *field_map)                      */
 /*****************************************************************************/
 static void
-xcsv_parse_val(const char* s, waypoint* wpt, const field_map_t* fmp,
+xcsv_parse_val(const char* s, Waypoint* wpt, const field_map_t* fmp,
                route_head** trk)
 {
   const char* enclosure = "";
@@ -1423,7 +1423,7 @@ xcsv_data_read(void)
 {
   char* buff;
   char* s;
-  waypoint* wpt_tmp;
+  Waypoint* wpt_tmp;
   int linecount = 0;
   queue* elem, *tmp;
   field_map_t* fmp;
@@ -1473,7 +1473,7 @@ xcsv_data_read(void)
     }
 
     if (strlen(buff)) {
-      wpt_tmp = new waypoint;
+      wpt_tmp = new Waypoint;
 
       s = buff;
       s = csv_lineparse(s, xcsv_file.field_delimiter,
@@ -1579,7 +1579,7 @@ xcsv_resetpathlen(const route_head* head)
 /*                  (the output meat)                                        */
 /*****************************************************************************/
 static void
-xcsv_waypt_pr(const waypoint* wpt)
+xcsv_waypt_pr(const Waypoint* wpt)
 {
   char buff[1024];
   const char* write_delimiter;
index a85e8d5d2ae22857636c31c870578f8341cddffe..f6110de4f27f1a68044aaee7508a556b8b7db4ab 100644 (file)
@@ -447,7 +447,7 @@ const global_trait* get_traits();
   typedef const char* xg_string;
 #endif
 
-class waypoint
+class Waypoint
 {
 private:
   static geocache_data empty_gc_data;
@@ -538,12 +538,12 @@ public:
   void* extra_data;    /* Extra data added by, say, a filter. */
 
 private:
-  waypoint& operator=(const waypoint& other);
+  Waypoint& operator=(const Waypoint& other);
 
 public:
-  waypoint();
-  ~waypoint();
-  waypoint(const waypoint& other);
+  Waypoint();
+  ~Waypoint();
+  Waypoint(const Waypoint& other);
 
   bool HasUrlLink() const;
   const UrlLink& GetUrlLink() const;
@@ -628,8 +628,8 @@ typedef void (*ff_deinit)(void);
 typedef void (*ff_read)(void);
 typedef void (*ff_write)(void);
 typedef void (*ff_exit)(void);
-typedef void (*ff_writeposn)(waypoint*);
-typedef waypoint* (*ff_readposn)(posn_status*);
+typedef void (*ff_writeposn)(Waypoint*);
+typedef Waypoint* (*ff_readposn)(posn_status*);
 
 #ifndef DEBUG_MEM
 char* get_option(const char* iarglist, const char* argname);
@@ -644,19 +644,19 @@ typedef void (*filter_process)(void);
 typedef void (*filter_deinit)(void);
 typedef void (*filter_exit)(void);
 
-typedef void (*waypt_cb)(const waypoint*);
+typedef void (*waypt_cb)(const Waypoint*);
 typedef void (*route_hdr)(const route_head*);
 typedef void (*route_trl)(const route_head*);
-void waypt_add(waypoint*);
-waypoint* waypt_dupe(const waypoint*);
-waypoint* waypt_new(void);
-void waypt_del(waypoint*);
-void waypt_free(waypoint*);
+void waypt_add(Waypoint*);
+Waypoint* waypt_dupe(const Waypoint*);
+Waypoint* waypt_new(void);
+void waypt_del(Waypoint*);
+void waypt_free(Waypoint*);
 void waypt_disp_all(waypt_cb);
 void waypt_disp_session(const session_t* se, waypt_cb cb);
 void waypt_init_bounds(bounds* bounds);
 int waypt_bounds_valid(bounds* bounds);
-void waypt_add_to_bounds(bounds* bounds, const waypoint* waypointp);
+void waypt_add_to_bounds(bounds* bounds, const Waypoint* waypointp);
 void waypt_compute_bounds(bounds*);
 double gcgeodist(const double lat1, const double lon1,
                  const double lat2, const double lon2);
@@ -664,31 +664,31 @@ void waypt_flush(queue*);
 void waypt_flush_all(void);
 unsigned int waypt_count(void);
 void set_waypt_count(unsigned int nc);
-void waypt_add_url(waypoint* wpt, const QString& link,
+void waypt_add_url(Waypoint* wpt, const QString& link,
                    const QString& url_link_text);
 void xcsv_setup_internal_style(const char* style_buf);
 void xcsv_read_internal_style(const char* style_buf);
-waypoint* find_waypt_by_name(const QString& name);
+Waypoint* find_waypt_by_name(const QString& name);
 void waypt_backup(signed int* count, queue** head_bak);
 void waypt_restore(signed int count, queue* head_bak);
 
-geocache_data* waypt_alloc_gc_data(waypoint* wpt);
-int waypt_empty_gc_data(const waypoint* wpt);
+geocache_data* waypt_alloc_gc_data(Waypoint* wpt);
+int waypt_empty_gc_data(const Waypoint* wpt);
 geocache_type gs_mktype(const QString& t);
 geocache_container gs_mkcont(const QString& t);
 
 route_head* route_head_alloc(void);
-void route_add(waypoint*);
-void route_add_wpt(route_head* rte, waypoint* wpt);
-void route_add_wpt_named(route_head* rte, waypoint* wpt, const QString& namepart, int number_digits);
-void route_del_wpt(route_head* rte, waypoint* wpt);
-void track_add_wpt(route_head* rte, waypoint* wpt);
-void track_add_wpt_named(route_head* rte, waypoint* wpt, const QString& namepart, int number_digits);
-void track_del_wpt(route_head* rte, waypoint* wpt);
+void route_add(Waypoint*);
+void route_add_wpt(route_head* rte, Waypoint* wpt);
+void route_add_wpt_named(route_head* rte, Waypoint* wpt, const QString& namepart, int number_digits);
+void route_del_wpt(route_head* rte, Waypoint* wpt);
+void track_add_wpt(route_head* rte, Waypoint* wpt);
+void track_add_wpt_named(route_head* rte, Waypoint* wpt, const QString& namepart, int number_digits);
+void track_del_wpt(route_head* rte, Waypoint* wpt);
 void route_add_head(route_head* rte);
 void route_del_head(route_head* rte);
 void route_reverse(const route_head* rte_hd);
-waypoint* route_find_waypt_by_name(route_head* rh, const char* name);
+Waypoint* route_find_waypt_by_name(route_head* rh, const char* name);
 void track_add_head(route_head* rte);
 void track_del_head(route_head* rte);
 void track_insert_head(route_head* rte, route_head* predecessor);
@@ -749,7 +749,7 @@ short_handle MKSHORT_NEW_HANDLE(DEBUG_PARAMS);
 #define mkshort( a, b) MKSHORT(a,b,__FILE__, __LINE__)
 #define mkshort_new_handle() MKSHORT_NEW_HANDLE(__FILE__,__LINE__)
 #endif
-String mkshort_from_wpt(short_handle h, const waypoint* wpt);
+String mkshort_from_wpt(short_handle h, const Waypoint* wpt);
 void mkshort_del_handle(short_handle* h);
 void setshort_length(short_handle, int n);
 void setshort_badchars(short_handle,  const char*);
@@ -876,14 +876,14 @@ extern style_vecs_t style_list[];
 
 void waypt_init(void);
 void route_init(void);
-void waypt_disp(const waypoint*);
+void waypt_disp(const Waypoint*);
 void waypt_status_disp(int total_ct, int myct);
-double waypt_time(const waypoint* wpt);
-double waypt_speed(const waypoint* A, const waypoint* B);
-double waypt_speed_ex(const waypoint* A, const waypoint* B);
-double waypt_course(const waypoint* A, const waypoint* B);
-double waypt_distance(const waypoint* A, const waypoint* B);
-double waypt_distance_ex(const waypoint* A, const waypoint* B);
+double waypt_time(const Waypoint* wpt);
+double waypt_speed(const Waypoint* A, const Waypoint* B);
+double waypt_speed_ex(const Waypoint* A, const Waypoint* B);
+double waypt_course(const Waypoint* A, const Waypoint* B);
+double waypt_distance(const Waypoint* A, const Waypoint* B);
+double waypt_distance_ex(const Waypoint* A, const Waypoint* B);
 
 NORETURN fatal(const char*, ...) PRINTFLIKE(1, 2);
 void is_fatal(const int condition, const char*, ...) PRINTFLIKE(2, 3);
@@ -982,7 +982,7 @@ time_t mkgmtime(struct tm* t);
 gpsbabel::DateTime current_time(void);
 void dotnet_time_to_time_t(double dotnet, time_t* t, int* ms);
 signed int month_lookup(const char* m);
-const char* get_cache_icon(const waypoint* waypointp);
+const char* get_cache_icon(const Waypoint* waypointp);
 const char* gs_get_cachetype(geocache_type t);
 const char* gs_get_container(geocache_container t);
 char* xml_entitize(const char* str);
index fcb2cd450ac0da4691067c09c12b49178b0e3742..f4acedaaee0e0fc7c456ba9cfb194ad4c847ba07 100644 (file)
@@ -152,7 +152,7 @@ static unsigned track_color_index(int bgr);
 
 static unsigned waypoint_i;
 static unsigned waypoint_n;
-static waypoint** wp_array;
+static Waypoint** wp_array;
 
 //-----------------------------------------------------------------------------
 // Message ids and sizes. Only the needed ones are here.
@@ -991,10 +991,10 @@ decode_time(const uint8_t* p)
   return mkgmtime(&t);
 }
 
-static waypoint*
+static Waypoint*
 decode_waypoint(const void* data)
 {
-  waypoint* wp = new waypoint;
+  Waypoint* wp = new Waypoint;
   const msg_waypoint_t* p = (const msg_waypoint_t*)data;
   const char* s;
   float f;
@@ -1026,7 +1026,7 @@ read_waypoints(void)
   message_t m;
   message_t* msg_array;
   unsigned msg_array_n;
-  waypoint* wp = NULL;
+  Waypoint* wp = NULL;
   unsigned n_point;
   unsigned notes_i = 0;
   unsigned notes_max = 0;
@@ -1149,7 +1149,7 @@ encode_time(time_t time_, uint8_t* p)
 }
 
 static void
-get_gc_notes(const waypoint* wp, int* symbol, char** notes, unsigned* notes_size)
+get_gc_notes(const Waypoint* wp, int* symbol, char** notes, unsigned* notes_size)
 {
   fs_xml* fs_gpx;
   xml_tag* root = NULL;
@@ -1382,7 +1382,7 @@ add_nuke(nuke_type type)
 }
 
 static void
-write_waypoint(const waypoint* wp)
+write_waypoint(const Waypoint* wp)
 {
   message_t m;
   msg_waypoint_t* p;
@@ -1524,7 +1524,7 @@ write_waypoints(void)
 // Track reading
 
 static void
-decode_sat_fix(waypoint* wp, const uint8_t status)
+decode_sat_fix(Waypoint* wp, const uint8_t status)
 {
   switch (status & 3) {
   case 1:
@@ -1554,7 +1554,7 @@ decode_track_point(const void* data, unsigned* wp_array_i, unsigned max_point)
     fatal(MYNAME ": read too many track points\n");
   }
   for (i = 0; i < n; i++, j++) {
-    waypoint* wp = new waypoint;
+    Waypoint* wp = new Waypoint;
     float elev = le_read_float(p->point[i].elevation);
     wp_array[j] = wp;
     wp->SetCreationTime(decode_time(&p->point[i].year));
@@ -1616,7 +1616,7 @@ read_track(route_head* track)
   }
   track->line_color.bbggrr = track_color(p->color[0]);
   n_point = le_readu32(p->total_points);
-  wp_array = (waypoint**) xcalloc(n_point, sizeof(*wp_array));
+  wp_array = (Waypoint**) xcalloc(n_point, sizeof(*wp_array));
   message_free(&msg_array[0]);
   for (i = 1; i < msg_array_n; i++) {
     unsigned id = message_get_id(&msg_array[i]);
@@ -1731,7 +1731,7 @@ write_track_points(void)
   unsigned j = 0;
 
   do {
-    const waypoint* wp = wp_array[i];
+    const Waypoint* wp = wp_array[i];
     float f;
 
     if (j == 0) {
@@ -1792,14 +1792,14 @@ write_track_begin(const route_head* track)
   waypoint_i = 0;
   waypoint_n = track->rte_waypt_ct;
   if (waypoint_n) {
-    wp_array = (waypoint**) xmalloc(waypoint_n * sizeof(*wp_array));
+    wp_array = (Waypoint**) xmalloc(waypoint_n * sizeof(*wp_array));
   }
 }
 
 static void
-write_track_point(const waypoint* wp)
+write_track_point(const Waypoint* wp)
 {
-  wp_array[waypoint_i++] = (waypoint*)wp;
+  wp_array[waypoint_i++] = (Waypoint*)wp;
 }
 
 static void
@@ -1863,7 +1863,7 @@ decode_route_shape(const void* data, unsigned* wp_array_i)
 
   for (i = 0; i < n; i++, j++) {
     char buf[32];
-    waypoint* wp = new waypoint;
+    Waypoint* wp = new Waypoint;
     wp_array[j] = wp;
     wp->latitude = delbin_rad2deg(le_read32(p->point[i].latitude));
     wp->longitude = delbin_rad2deg(le_read32(p->point[i].longitude));
@@ -1873,13 +1873,13 @@ decode_route_shape(const void* data, unsigned* wp_array_i)
   *wp_array_i = j;
 }
 
-static waypoint*
+static Waypoint*
 decode_route_point(const void* data)
 {
   const msg_route_point_t* p = (const msg_route_point_t*) data;
   const char* s = NULL;
   gbfile* fd = gbfopen(NULL, "w", MYNAME);
-  waypoint* wp = new waypoint;
+  Waypoint* wp = new Waypoint;
   if (p->name[0]) {
     wp->shortname = p->name;
   }
@@ -1999,7 +1999,7 @@ read_route(route_head* route)
   route_total = le_readu32(p->total_route_point);
   shape_total = le_readu32(p->total_shape_point);
   total = route_total + shape_total;
-  wp_array = (waypoint**) xcalloc(total, sizeof(*wp_array));
+  wp_array = (Waypoint**) xcalloc(total, sizeof(*wp_array));
   if (global_opts.debug_level >= DBGLVL_L) {
     warning(MYNAME ": route '%s' %u points, %u shape points\n",
             CSTRc(route->rte_name), route_total, shape_total);
@@ -2111,7 +2111,7 @@ static unsigned shape_point_n;
 static unsigned* shape_point_counts;
 
 static void
-write_route_shape_points(waypoint** array, unsigned n)
+write_route_shape_points(Waypoint** array, unsigned n)
 {
   message_t m;
   const unsigned pt_per_msg = 25;
@@ -2150,7 +2150,7 @@ write_route_points(void)
   while (i < waypoint_n) {
     message_t m;
     unsigned shape_n;
-    const waypoint* wp = wp_array[i];
+    const Waypoint* wp = wp_array[i];
     msg_route_point_t* p;
     char* s;
 
@@ -2198,15 +2198,15 @@ write_route_begin(const route_head* track)
   shape_point_n = 0;
   waypoint_n = track->rte_waypt_ct;
   if (waypoint_n) {
-    wp_array = (waypoint**) xmalloc(waypoint_n * sizeof(*wp_array));
+    wp_array = (Waypoint**) xmalloc(waypoint_n * sizeof(*wp_array));
     shape_point_counts = (unsigned int*) xcalloc(waypoint_n, sizeof(*shape_point_counts));
   }
 }
 
 static void
-write_route_point(const waypoint* wp)
+write_route_point(const Waypoint* wp)
 {
-  wp_array[waypoint_i++] = (waypoint*)wp;
+  wp_array[waypoint_i++] = (Waypoint*)wp;
 #if NEW_STRINGS
   if (wp->shortname.startsWith("SHP")) {
 #else
@@ -2262,10 +2262,10 @@ write_routes(void)
 //-----------------------------------------------------------------------------
 // Current position
 
-static waypoint*
+static Waypoint*
 decode_navmsg(const void* data)
 {
-  waypoint* wp = new waypoint;
+  Waypoint* wp = new Waypoint;
   const msg_navigation_t* p = (const msg_navigation_t*) data;
   struct tm t;
 
@@ -2291,10 +2291,10 @@ decode_navmsg(const void* data)
   return wp;
 }
 
-static waypoint*
+static Waypoint*
 read_position(void)
 {
-  waypoint* wp;
+  Waypoint* wp;
   message_t m;
 
   message_init(&m);
@@ -2449,7 +2449,7 @@ delbin_write(void)
   }
 }
 
-static waypoint*
+static Waypoint*
 delbin_rd_position(posn_status* status)
 {
   return read_position();
index e240980f29026a3132ee7a3a8232f053db69c81d..18a2d802a1507fb51ffefec400992ce52d3fb3fc 100644 (file)
@@ -54,7 +54,7 @@ gpl_rd_init(const char* fname)
 static void
 gpl_read(void)
 {
-  waypoint* wpt_tmp;
+  Waypoint* wpt_tmp;
   route_head* track_head;
   gpl_point_t gp;
   double alt_feet;
@@ -63,7 +63,7 @@ gpl_read(void)
   track_add_head(track_head);
 
   while (gbfread(&gp, sizeof(gp), 1, gplfile_in) > 0) {
-    wpt_tmp = new waypoint;
+    wpt_tmp = new Waypoint;
     wpt_tmp->latitude = le_read_double(&gp.lat);
     wpt_tmp->longitude = le_read_double(&gp.lon);
     alt_feet = le_read_double(&gp.alt);
@@ -122,7 +122,7 @@ gpl_wr_deinit(void)
 }
 
 static void
-gpl_trackpt(const waypoint* wpt)
+gpl_trackpt(const Waypoint* wpt)
 {
   double alt_feet = METERS_TO_FEET(wpt->altitude);
   int status = 3;
index 379205fe56fdf7b31e23ef16183dd155b5fe8706..cf4291519ccbbdf73bd52f3c13cd1fe49f3e751a 100644 (file)
@@ -50,7 +50,7 @@ static gpsdata_type data_type;
 /*-----------------------------------------------------------------------------*/
 
 static garmin_fs_t*
-gmsd_init(waypoint* wpt)
+gmsd_init(Waypoint* wpt)
 {
   garmin_fs_t* gmsd = GMSD_FIND(wpt);
   if (gmsd == NULL) {
@@ -151,7 +151,7 @@ read_until_wcstr(const char* str)
 static void
 destinator_read_poi(void)
 {
-  waypoint* wpt;
+  Waypoint* wpt;
   int count = 0;
 
   gbfrewind(fin);
@@ -172,7 +172,7 @@ destinator_read_poi(void)
 
     count++;
 
-    wpt = new waypoint;
+    wpt = new Waypoint;
 
     wpt->shortname = read_wcstr(0);
     wpt->notes = read_wcstr(0);                /* comment */
@@ -234,7 +234,7 @@ destinator_read_rte(void)
 
   while (!(gbfeof(fin))) {
     QString str;
-    waypoint* wpt;
+    Waypoint* wpt;
 
     if (count == 0) {
       str = read_wcstr(0);
@@ -247,7 +247,7 @@ destinator_read_rte(void)
 
     count++;
 
-    wpt = new waypoint;
+    wpt = new Waypoint;
 
     wpt->shortname = read_wcstr(0);
     wpt->notes = read_wcstr(0);
@@ -286,7 +286,7 @@ destinator_read_trk(void)
   gbfrewind(fin);
 
   while (!(gbfeof(fin))) {
-    waypoint* wpt;
+    Waypoint* wpt;
     struct tm tm;
     char buff[20];
     int date;
@@ -297,7 +297,7 @@ destinator_read_trk(void)
       break;
     }
 
-    wpt = new waypoint;
+    wpt = new Waypoint;
 
     wpt->longitude = gbfgetdbl(fin);
     wpt->latitude = gbfgetdbl(fin);
@@ -386,7 +386,7 @@ destinator_read(void)
 /*-----------------------------------------------------------------------------*/
 
 static void
-destinator_wpt_disp(const waypoint* wpt)
+destinator_wpt_disp(const Waypoint* wpt)
 {
   garmin_fs_t* gmsd = GMSD_FIND(wpt);
 
@@ -419,7 +419,7 @@ destinator_wpt_disp(const waypoint* wpt)
 }
 
 static void
-destinator_trkpt_disp(const waypoint* wpt)
+destinator_trkpt_disp(const Waypoint* wpt)
 {
   int i;
 
@@ -465,7 +465,7 @@ destinator_trkpt_disp(const waypoint* wpt)
 }
 
 static void
-destinator_rtept_disp(const waypoint* wpt)
+destinator_rtept_disp(const Waypoint* wpt)
 {
   write_wcstr(DST_ITINERARY);
 #if NEW_STRINGS
index b51a39fbe0e71135c0d8c1350076903458d29f47..71d6bb470630dac0473202fe4cf2386c61c2c58d 100644 (file)
@@ -224,7 +224,7 @@ process_gpsfile(uint8_t data[], route_head** track)
   const int recordsizes[3] = {8, 20, 32};
   int i, style, recsize;
   int lat, lon, bintime, bindate;
-  waypoint* wpt;
+  Waypoint* wpt;
 
   /* the first record of each file is always full-sized; its style field
    * determines the format of all subsequent records in the file */
@@ -266,7 +266,7 @@ process_gpsfile(uint8_t data[], route_head** track)
       track_add_head(*track);
     }
 
-    wpt = new waypoint;
+    wpt = new Waypoint;
     latitude = bin2deg(lat);
     if (latitude >= 100) {
       manual_point = 1;
index 5ebe298a08f34806373cb8ab94fd82bc6b451cfd..6b99c39a1a4ef0f77f6f525ebb2a91c86139a917 100644 (file)
@@ -80,13 +80,13 @@ arglist_t fix_args[] = {
  * Decide whether to keep or toss this point.
  */
 static void
-fix_process_wpt(const waypoint* wpt)
+fix_process_wpt(const Waypoint* wpt)
 {
   int del = 0;
   int delh = 0;
   int delv = 0;
 
-  waypoint* waypointp = (waypoint*) wpt;
+  Waypoint* waypointp = (Waypoint*) wpt;
 
   if ((hdopf >= 0.0) && (waypointp->hdop > hdopf)) {
     delh = 1;
index ef27bb95f50984158ce89498336f17a6c97d0218..de6dfa082c426ffdcf777a262e9172613b1acab0 100644 (file)
@@ -37,7 +37,7 @@
 static gbfile* fin, *fout;
 
 static char* xmlbin;
-static waypoint* xmlwpt;
+static Waypoint* xmlwpt;
 static route_head* xmltrk;
 static QString xmlgrid;
 static int xmldatum;
@@ -107,7 +107,7 @@ static xg_tag_mapping tlog3b_xgcb_map[] = {
 /* helpers */
 
 static void
-convert_datum(waypoint* wpt, int datum)
+convert_datum(Waypoint* wpt, int datum)
 {
   if (datum != DATUM_WGS84) {
     double lat = wpt->latitude;
@@ -121,7 +121,7 @@ convert_datum(waypoint* wpt, int datum)
 
 
 static void
-finalize_pt(waypoint* wpt)
+finalize_pt(Waypoint* wpt)
 {
   if (xmlgrid == "BNG") {
     GPS_Math_NGENToAiry1830LatLon(xmlEasting, xmlNorthing,
@@ -253,7 +253,7 @@ tlog3b_xgcb_tfdes(xg_string args, const QXmlStreamAttributes* unused)
 static void
 tlog3b_xgcb_wptst(xg_string args, const QXmlStreamAttributes* unused)
 {
-  xmlwpt = new waypoint;
+  xmlwpt = new Waypoint;
   xmldatum = DATUM_WGS84;
 }
 
@@ -261,7 +261,7 @@ tlog3b_xgcb_wptst(xg_string args, const QXmlStreamAttributes* unused)
 static void
 tlog3b_xgcb_tptst(xg_string args, const QXmlStreamAttributes* unused)
 {
-  xmlwpt = new waypoint;
+  xmlwpt = new Waypoint;
   xmldatum = DATUM_WGS84;
 }
 
@@ -473,7 +473,7 @@ read_CTrackFile(const int version)
   }
 
   while (tcount > 0) {
-    waypoint* wpt;
+    Waypoint* wpt;
 
     tcount--;
 
@@ -481,7 +481,7 @@ read_CTrackFile(const int version)
       datum = read_datum(fin);
     }
 
-    wpt = new waypoint;
+    wpt = new Waypoint;
 
     wpt->latitude = gbfgetdbl(fin);
     wpt->longitude = gbfgetdbl(fin);
@@ -517,7 +517,7 @@ read_CTrackFile(const int version)
     }
 
     while (! gbfeof(fin)) {
-      waypoint* wpt;
+      Waypoint* wpt;
 
       i = gbfgetc(fin);
       if (i == 0) {
@@ -527,7 +527,7 @@ read_CTrackFile(const int version)
       gbfungetc(i, fin);
       datum = read_datum(fin);
 
-      wpt = new waypoint;
+      wpt = new Waypoint;
 
       wpt->latitude = gbfgetdbl(fin);
       wpt->longitude = gbfgetdbl(fin);
@@ -552,12 +552,12 @@ read_CTrackFile(const int version)
   datum = read_datum(fin);
 
   while (wcount > 0) {
-    waypoint* wpt;
+    Waypoint* wpt;
     int32_t namect, i;
 
     wcount--;
 
-    wpt = new waypoint;
+    wpt = new Waypoint;
 
     wpt->latitude = gbfgetdbl(fin);
     wpt->longitude = gbfgetdbl(fin);
@@ -797,7 +797,7 @@ track_tlr_cb(const route_head* trk)
 }
 
 static void
-track_wpt_cb(const waypoint* wpt)
+track_wpt_cb(const Waypoint* wpt)
 {
   if (this_index != track_index) {
     return;
@@ -809,7 +809,7 @@ track_wpt_cb(const waypoint* wpt)
 }
 
 static void
-wpt_cb(const waypoint* wpt)
+wpt_cb(const Waypoint* wpt)
 {
   int names;
 
index 338ca5cfd1b68d8985cfb4b943706b5268b53264..b04c3f85d37c757aac6dae09c0091180962ee74b 100644 (file)
@@ -53,7 +53,7 @@ arglist_t dup_args[] = {
 typedef struct btree_node {
   struct btree_node* left, *right;
   unsigned long data;
-  waypoint* wpt;
+  Waypoint* wpt;
 } btree_node;
 
 static btree_node*
@@ -107,7 +107,7 @@ free_tree(btree_node* tree)
 }
 
 typedef struct {
-  waypoint* wpt;
+  Waypoint* wpt;
   int index;
 } wpt_ptr;
 
@@ -174,7 +174,7 @@ compare(const void* a, const void* b)
 static void
 duplicate_process(void)
 {
-  waypoint* waypointp;
+  Waypoint* waypointp;
   btree_node* newnode, * btmp, * sup_tree = NULL;
   btree_node* oldnode = NULL;
   unsigned long crc = 0;
@@ -183,7 +183,7 @@ duplicate_process(void)
     char lat[13];
     char lon[13];
   } dupe;
-  waypoint* delwpt = NULL;
+  Waypoint* delwpt = NULL;
 
   int i, ct = waypt_count();
   wpt_ptr* htable, *bh;
@@ -194,7 +194,7 @@ duplicate_process(void)
 
   i = 0;
   QUEUE_FOR_EACH(&waypt_head, elem, tmp) {
-    bh->wpt = (waypoint*) elem;
+    bh->wpt = (Waypoint*) elem;
     bh->index = i;
     i ++;
     bh ++;
index 52fa6acc1036785d24b4dc1eb22ccbcbd2038119..b5986c379866fcc5996578c6ced2ef979e0572ae 100644 (file)
@@ -81,9 +81,9 @@ data_read(void)
   char ibuf[10];
   do {
     unsigned char tag;
-    waypoint* wpt_tmp;
+    Waypoint* wpt_tmp;
 
-    wpt_tmp = new waypoint;
+    wpt_tmp = new Waypoint;
     UrlLink link;
 
     for (tag = gbfgetc(file_in); tag != 0xff; tag = gbfgetc(file_in)) {
@@ -153,7 +153,7 @@ data_read(void)
 
 
 static void
-ez_disp(const waypoint* wpt)
+ez_disp(const Waypoint* wpt)
 {
   gbfputc('W', file_out);
 #if NEW_STRINGS
index 7272fa4f3b459031c46498d7374f0b509a46eac6..9ccec1f281543841054e5135e5d949bfa72162e9 100644 (file)
@@ -108,7 +108,7 @@ data_read(void)
   route_add_head(route);
 
   while (1 == gbfread(&ewpt, sizeof(ewpt), 1, file_in)) {
-    waypoint* wpt = new waypoint;
+    Waypoint* wpt = new Waypoint;
     wpt->latitude = enigmaPositionToDec(le_read32(&ewpt.latitude));
     wpt->longitude = enigmaPositionToDec(le_read32(&ewpt.longitude));
     char*sn = xstrndup(ewpt.shortname, ewpt.shortname_len);
@@ -167,7 +167,7 @@ wr_init(const char* fname)
 #endif
 
 static void
-enigma_waypt_disp(const waypoint* wpt)
+enigma_waypt_disp(const Waypoint* wpt)
 {
   struct enigma_wpt ewpt;
 
index 8eb739744f864920d2b3d104079ddfd870f051a2..3615120e65baba69d2e0ea02fea7163c73a7678e 100644 (file)
@@ -134,7 +134,7 @@ typedef struct exif_app_s {
 static gbfile* fin, *fout;
 static queue exif_apps;
 static exif_app_t* exif_app;
-const waypoint* exif_wpt_ref;
+const Waypoint* exif_wpt_ref;
 time_t exif_time_ref;
 static char exif_success;
 static char* exif_fout_name;
@@ -670,10 +670,10 @@ exif_get_exif_time(exif_app_t* app)
   return res.toTime_t();
 }
 
-static waypoint*
+static Waypoint*
 exif_waypt_from_exif_app(exif_app_t* app)
 {
-  waypoint* wpt;
+  Waypoint* wpt;
   queue* elem, *tmp;
   exif_ifd_t* ifd;
   exif_tag_t* tag;
@@ -693,7 +693,7 @@ exif_waypt_from_exif_app(exif_app_t* app)
     return NULL;
   }
 
-  wpt = new waypoint;
+  wpt = new Waypoint;
 
   wpt->latitude = unknown_alt;
   wpt->longitude = unknown_alt;
@@ -1095,7 +1095,7 @@ exif_remove_tag(const int ifd_nr, const int tag_id)
 }
 
 static void
-exif_find_wpt_by_time(const waypoint* wpt)
+exif_find_wpt_by_time(const Waypoint* wpt)
 {
   if (!wpt->creation_time.isValid()) {
     return;
@@ -1109,7 +1109,7 @@ exif_find_wpt_by_time(const waypoint* wpt)
 }
 
 static void
-exif_find_wpt_by_name(const waypoint* wpt)
+exif_find_wpt_by_name(const Waypoint* wpt)
 {
   if (exif_wpt_ref != NULL) {
     return;
@@ -1354,7 +1354,7 @@ static void
 exif_read(void)
 {
   uint16_t soi;
-  waypoint* wpt;
+  Waypoint* wpt;
 
   soi = gbfgetuint16(fin);
   is_fatal(soi != 0xFFD8, MYNAME ": Unknown image file.");     /* only jpeg for now */
@@ -1465,7 +1465,7 @@ exif_write(void)
   }
 
   if (exif_wpt_ref != NULL) {
-    const waypoint* wpt = exif_wpt_ref;
+    const Waypoint* wpt = exif_wpt_ref;
 
     exif_put_long(IFD0, IFD0_TAG_GPS_IFD_OFFS, 0, 0);
     exif_put_value(GPS_IFD, GPS_IFD_TAG_VERSION, EXIF_TYPE_BYTE, 4, 0, writer_gps_tag_version);
index 9650a2467343940a06d0595e1fc597b78ba02703..c05e07688fd2049ca15de252613bfaab1541f0f1 100644 (file)
@@ -28,7 +28,7 @@
 
 extern queue waypt_head;
 #if NEWQ
-extern QList<waypoint*> waypt_list;
+extern QList<Waypoint*> waypt_list;
 #endif
 
 typedef struct filter_vecs {
index 2121de35506c5a80cb39c311d5beec30a1d070d1..3c1ee51a0c9c3353d1e2c65a294c88a6a6e78618 100644 (file)
@@ -70,7 +70,7 @@ arglist_t g7towin_args[] = {
 #define WPT_cD_OFS     0x0cD00
 
 static void
-parse_line(char* buff, int index, const char* delimiter, waypoint* wpt)
+parse_line(char* buff, int index, const char* delimiter, Waypoint* wpt)
 {
   char* cin;
   garmin_fs_p gmsd = GMSD_FIND(wpt);
@@ -264,16 +264,16 @@ parse_line(char* buff, int index, const char* delimiter, waypoint* wpt)
   }
 }
 
-static waypoint*
+static Waypoint*
 parse_waypt(char* buff)
 {
   char* cin, *cerr;
   int i;
   struct tm tm;
-  waypoint* wpt;
+  Waypoint* wpt;
   garmin_fs_p gmsd;
 
-  wpt = new waypoint;
+  wpt = new Waypoint;
   gmsd = garmin_fs_alloc(-1);
   fs_chain_add(&wpt->fs, (format_specific_data*) gmsd);
 
@@ -341,13 +341,13 @@ parse_waypt(char* buff)
   return wpt;
 }
 
-static waypoint*
+static Waypoint*
 parse_trkpt(char* buff)
 {
   garmin_fs_p gmsd;
-  waypoint* wpt;
+  Waypoint* wpt;
 
-  wpt = new waypoint;
+  wpt = new Waypoint;
   gmsd = garmin_fs_alloc(-1);
   fs_chain_add(&wpt->fs, (format_specific_data*) gmsd);
 
@@ -409,8 +409,8 @@ data_read(void)
 {
   char* buff;
   int line = 0;
-  waypoint* wpt = NULL;
-  waypoint* prev = NULL;
+  Waypoint* wpt = NULL;
+  Waypoint* prev = NULL;
   route_head* head = NULL;
 
   while ((buff = gbfgetstr(fin))) {
@@ -459,7 +459,7 @@ data_read(void)
       break;
 
     case 'I': /* event point */
-      wpt = new waypoint;
+      wpt = new Waypoint;
       cdata += parse_coordinates(cdata, datum, grid,
                                  &wpt->latitude, &wpt->longitude, MYNAME);
       xasprintf(&wpt->shortname, "Event%d", ++event_ct);
index 3e17716dd841ad3f0a759e25ac5bf3cbea33304b..677f1d3ad8e4974963de15d2b3ce2f2e6625812e 100644 (file)
@@ -338,7 +338,7 @@ waypt_read(void)
   GPS_PWay* way = NULL;
 
   if (getposn) {
-    waypoint* wpt = new waypoint;
+    Waypoint* wpt = new Waypoint;
     wpt->latitude = gps_save_lat;
     wpt->longitude = gps_save_lon;
     wpt->shortname = "Position";
@@ -354,7 +354,7 @@ waypt_read(void)
   }
 
   for (i = 0; i < n; i++) {
-    waypoint* wpt_tmp = new waypoint;
+    Waypoint* wpt_tmp = new Waypoint;
 
     wpt_tmp->shortname = way[i]->ident;
     wpt_tmp->description = QString(way[i]->cmnt).simplified();
@@ -406,7 +406,7 @@ static int lap_read_nop_cb(int n, struct GPS_SWay** dp)
 
 // returns 1 if the waypoint's start_time can be found
 // in the laps array, 0 otherwise
-unsigned int checkWayPointIsAtSplit(waypoint* wpt, GPS_PLap* laps, int nlaps)
+unsigned int checkWayPointIsAtSplit(Waypoint* wpt, GPS_PLap* laps, int nlaps)
 {
   int result = 0;
 
@@ -459,7 +459,7 @@ track_read(void)
   }
 
   for (i = 0; i < ntracks; i++) {
-    waypoint* wpt;
+    Waypoint* wpt;
 
     /*
      * This is probably always in slot zero, but the Garmin
@@ -491,7 +491,7 @@ track_read(void)
     if (array[i]->no_latlon || array[i]->ishdr) {
       continue;
     }
-    wpt = new waypoint;
+    wpt = new Waypoint;
 
     wpt->longitude = array[i]->lon;
     wpt->latitude = array[i]->lat;
@@ -563,7 +563,7 @@ route_read(void)
       if (array[i]->islink)  {
         continue;
       } else {
-        waypoint* wpt_tmp = new waypoint;
+        Waypoint* wpt_tmp = new Waypoint;
         wpt_tmp->latitude = array[i]->lat;
         wpt_tmp->longitude = array[i]->lon;
         wpt_tmp->shortname = array[i]->ident;
@@ -595,7 +595,7 @@ lap_read_as_track(void)
     return;
   }
   for (i = 0; i < ntracks; i++) {
-    waypoint* wpt;
+    Waypoint* wpt;
     if (array[i]->index == -1) {
       index=i;
     } else {
@@ -618,7 +618,7 @@ lap_read_as_track(void)
       trk_head->rte_name = tbuf;
       track_add_head(trk_head);
 
-      wpt = new waypoint;
+      wpt = new Waypoint;
 
       wpt->longitude = array[i]->begin_lon;
       wpt->latitude = array[i]->begin_lat;
@@ -641,7 +641,7 @@ lap_read_as_track(void)
     *                  continue;
     *          }
     */
-    wpt = new waypoint;
+    wpt = new Waypoint;
 
     wpt->longitude = array[i]->end_lon;
     wpt->latitude = array[i]->end_lat;
@@ -674,7 +674,7 @@ lap_read_as_track(void)
  * to the data type we use throughout.   Yes, we do lose some data that way.
  */
 static void
-pvt2wpt(GPS_PPvt_Data pvt, waypoint* wpt)
+pvt2wpt(GPS_PPvt_Data pvt, Waypoint* wpt)
 {
   double wptime, wptimes;
 
@@ -746,10 +746,10 @@ pvt_init(const char* fname)
   GPS_Command_Pvt_On(fname, &pvt_fd);
 }
 
-static waypoint*
+static Waypoint*
 pvt_read(posn_status* posn_status)
 {
-  waypoint* wpt = new waypoint;
+  Waypoint* wpt = new Waypoint;
   GPS_PPvt_Data pvt = GPS_Pvt_New();
 
   if (GPS_Command_Pvt_Get(&pvt_fd, &pvt)) {
@@ -852,7 +852,7 @@ waypt_write_cb(GPS_PWay* way)
  * description.
  */
 const char*
-get_gc_info(waypoint* wpt)
+get_gc_info(Waypoint* wpt)
 {
   if (global_opts.smart_names) {
     if (wpt->gc_data->type == gt_virtual) {
@@ -898,11 +898,11 @@ waypoint_prepare(void)
   i = 0;
 
   QUEUE_FOR_EACH(&waypt_head, elem, tmp) {
-    waypoint* wpt;
+    Waypoint* wpt;
     char* ident;
     char obuf[256];
 
-    wpt = (waypoint*) elem;
+    wpt = (Waypoint*) elem;
 #if NEW_STRINGS 
     QString src;
     if (!wpt->description.isEmpty()) {
@@ -1048,7 +1048,7 @@ route_hdr_pr(const route_head* rte)
 }
 
 static void
-route_waypt_pr(const waypoint* wpt)
+route_waypt_pr(const Waypoint* wpt)
 {
   GPS_PWay rte = *cur_tx_routelist_entry;
 
@@ -1158,7 +1158,7 @@ track_hdr_pr(const route_head* trk_head)
 }
 
 static void
-track_waypt_pr(const waypoint* wpt)
+track_waypt_pr(const Waypoint* wpt)
 {
   (*cur_tx_tracklist_entry)->lat = wpt->latitude;
   (*cur_tx_tracklist_entry)->lon = wpt->longitude;
index 03c629f26f904f4e900eb825114c6e25c89ad854..8370acb0566a67f55d303b61831e0801d0f19f21 100644 (file)
@@ -287,7 +287,7 @@ fit_parse_data(fit_message_def* def, int time_offset)
   uint16_t power = 0xffff;
   int8_t temperature = 0x7f;
   int i;
-  waypoint* waypt;
+  Waypoint* waypt;
 
   if (global_opts.debug_level >= 7) {
     debug_print(7,"%s: parsing fit data ID %d with num_fields=%d\n", MYNAME, def->global_id, def->num_fields);
@@ -380,7 +380,7 @@ fit_parse_data(fit_message_def* def, int time_offset)
       break;
     }
 
-    waypt = new waypoint;
+    waypt = new Waypoint;
     waypt->latitude = (lat / (double)0x7fffffff) * 180;
     waypt->longitude = (lon / (double)0x7fffffff) * 180;
     if (alt != 0xffff) {
index 59fae1780268e4c121ecb2c75bf7d44e9d26f81e..ab767630f6922d1413b8ceabd35ec2e93d65495d 100644 (file)
@@ -178,7 +178,7 @@ void garmin_fs_convert(void* fs)
 /* GPX - out */
 
 void
-garmin_fs_xml_fprint(const waypoint* waypt,
+garmin_fs_xml_fprint(const Waypoint* waypt,
                      QXmlStreamWriter* writer)
 {
   const char* phone, *addr;
@@ -284,7 +284,7 @@ garmin_fs_xml_fprint(const waypoint* waypt,
 }
 
 void
-garmin_fs_xml_convert(const int base_tag, int tag, const QString& Qcdatastr, waypoint* waypt)
+garmin_fs_xml_convert(const int base_tag, int tag, const QString& Qcdatastr, Waypoint* waypt)
 {
   garmin_fs_t* gmsd;
 // FIXME: eliminate C string copy/use here:
@@ -402,7 +402,7 @@ garmin_fs_convert_category(const char* category_name, uint16_t* category)
 }
 
 unsigned char
-garmin_fs_merge_category(const char* category_name, waypoint* waypt)
+garmin_fs_merge_category(const char* category_name, Waypoint* waypt)
 {
   uint16_t cat;
   garmin_fs_t* gmsd;
@@ -424,7 +424,7 @@ garmin_fs_merge_category(const char* category_name, waypoint* waypt)
 }
 
 void
-garmin_fs_garmin_after_read(const GPS_PWay way, waypoint* wpt, const int protoid)
+garmin_fs_garmin_after_read(const GPS_PWay way, Waypoint* wpt, const int protoid)
 {
   garmin_fs_t* gmsd = NULL;
 
@@ -459,7 +459,7 @@ garmin_fs_garmin_after_read(const GPS_PWay way, waypoint* wpt, const int protoid
 }
 
 void
-garmin_fs_garmin_before_write(const waypoint* wpt, GPS_PWay way, const int protoid)
+garmin_fs_garmin_before_write(const Waypoint* wpt, GPS_PWay way, const int protoid)
 {
   garmin_fs_t* gmsd = GMSD_FIND(wpt);
 
index e38193403f14fe593fca48d41e816037354655ad..42c4a6c8ed1e66a5bd506169a67337d84e88c263 100644 (file)
@@ -122,9 +122,9 @@ void garmin_fs_convert(void* fs);
 char* garmin_fs_xstrdup(const char* src, size_t size);
 
 /* for GPX */
-void garmin_fs_xml_convert(const int base_tag, int tag, const QString& cdatastr, waypoint* waypt);
+void garmin_fs_xml_convert(const int base_tag, int tag, const QString& cdatastr, Waypoint* waypt);
 class QXmlStreamWriter;
-void garmin_fs_xml_fprint(const waypoint* waypt, QXmlStreamWriter*);
+void garmin_fs_xml_fprint(const Waypoint* waypt, QXmlStreamWriter*);
 
 /* common garmin_fs utilities */
 
@@ -132,11 +132,11 @@ void garmin_fs_xml_fprint(const waypoint* waypt, QXmlStreamWriter*);
 unsigned char garmin_fs_convert_category(const char* category_name, uint16_t* category);
 
 /* ..merge_category: returns 1=OK; 0=Unable to convert category */
-unsigned char garmin_fs_merge_category(const char* category_name, waypoint* waypt);
+unsigned char garmin_fs_merge_category(const char* category_name, Waypoint* waypt);
 
 #define GMSD_SECTION_CATEGORIES "Garmin Categories"
 
-void garmin_fs_garmin_after_read(const GPS_PWay way, waypoint* wpt, const int protoid);
-void garmin_fs_garmin_before_write(const waypoint* wpt, GPS_PWay way, const int protoid);
+void garmin_fs_garmin_after_read(const GPS_PWay way, Waypoint* wpt, const int protoid);
+void garmin_fs_garmin_before_write(const Waypoint* wpt, GPS_PWay way, const int protoid);
 
 #endif
index 316496be96c74a481e83a44f5373e54a8ae8feed..7217bd8a1de6d46d99ab9985717eb9614d33e03a 100644 (file)
@@ -222,7 +222,7 @@ static time_t gpi_timestamp = 0;
 
 /* look for or initialize GMSD */
 static garmin_fs_t*
-gpi_gmsd_init(waypoint* wpt)
+gpi_gmsd_init(Waypoint* wpt)
 {
   garmin_fs_t* gmsd = GMSD_FIND(wpt);
   if (wpt == NULL) {
@@ -363,7 +363,7 @@ read_header(void)
 }
 
 /* gpi tag handler */
-static int read_tag(const char* caller, const int tag, waypoint* wpt);
+static int read_tag(const char* caller, const int tag, Waypoint* wpt);
 
 
 /* read a single poi with all options */
@@ -371,7 +371,7 @@ static void
 read_poi(const int sz, const int tag)
 {
   int pos, len;
-  waypoint* wpt;
+  Waypoint* wpt;
 
 #ifdef GPI_DBG
   PP;
@@ -388,7 +388,7 @@ read_poi(const int sz, const int tag)
   (void) len;
   pos = gbftell(fin);
 
-  wpt = new waypoint;
+  wpt = new Waypoint;
   wpt->icon_descr = DEFAULT_ICON;
 
   wpt->latitude = GPS_Math_Semi_To_Deg(gbfgetint32(fin));
@@ -510,7 +510,7 @@ read_poi_group(const int sz, const int tag)
 // length field)
 /* gpi tag handler */
 static int
-read_tag(const char* caller, const int tag, waypoint* wpt)
+read_tag(const char* caller, const int tag, Waypoint* wpt)
 {
   int pos, sz, dist;
   double speed;
@@ -762,8 +762,8 @@ write_string(const QString& str, const char long_format)
 static int
 compare_wpt_cb(const queue* a, const queue* b)
 {
-  const waypoint* wa = (waypoint*) a;
-  const waypoint* wb = (waypoint*) b;
+  const Waypoint* wa = (Waypoint*) a;
+  const Waypoint* wb = (Waypoint*) b;
 #if NEW_STRINGS
   return wa->shortname.compare(wb->shortname);
 #else
@@ -815,7 +815,7 @@ wdata_free(writer_data_t* data)
   queue* elem, *tmp;
 
   QUEUE_FOR_EACH(&data->Q, elem, tmp) {
-    waypoint* wpt = (waypoint*)elem;
+    Waypoint* wpt = (Waypoint*)elem;
 
     if (wpt->extra_data) {
       gpi_waypt_t* dt = (gpi_waypt_t*) wpt->extra_data;
@@ -845,7 +845,7 @@ wdata_free(writer_data_t* data)
 
 
 static void
-wdata_add_wpt(writer_data_t* data, waypoint* wpt)
+wdata_add_wpt(writer_data_t* data, Waypoint* wpt)
 {
   data->ct++;
   ENQUEUE_TAIL(&data->Q, &wpt->Q);
@@ -873,7 +873,7 @@ wdata_check(writer_data_t* data)
 
   center_lat = center_lon = 0;
   QUEUE_FOR_EACH(&data->Q, elem, tmp) {
-    waypoint* wpt = (waypoint*) elem;
+    Waypoint* wpt = (Waypoint*) elem;
     center_lat += wpt->latitude;
     center_lon += wpt->longitude;
   }
@@ -881,7 +881,7 @@ wdata_check(writer_data_t* data)
   center_lon /= data->ct;
 
   QUEUE_FOR_EACH(&data->Q, elem, tmp) {
-    waypoint* wpt = (waypoint*) elem;
+    Waypoint* wpt = (Waypoint*) elem;
     writer_data_t** ref;
 
     if (wpt->latitude < center_lat) {
@@ -932,7 +932,7 @@ wdata_compute_size(writer_data_t* data)
   res = 23;    /* bounds, ... of tag 0x80008 */
 
   QUEUE_FOR_EACH(&data->Q, elem, tmp) {
-    waypoint* wpt = (waypoint*) elem;
+    Waypoint* wpt = (Waypoint*) elem;
     gpi_waypt_t* dt;
     garmin_fs_t* gmsd;
     QString str;
@@ -1095,7 +1095,7 @@ wdata_write(const writer_data_t* data)
   QUEUE_FOR_EACH(&data->Q, elem, tmp) {
     QString str;
     int s0, s1;
-    waypoint* wpt = (waypoint*)elem;
+    Waypoint* wpt = (Waypoint*)elem;
     gpi_waypt_t* dt = (gpi_waypt_t*) wpt->extra_data;
 
     str = wpt->description;
@@ -1282,13 +1282,13 @@ write_header(void)
 
 
 static void
-enum_waypt_cb(const waypoint* ref)
+enum_waypt_cb(const Waypoint* ref)
 {
-  waypoint* wpt;
+  Waypoint* wpt;
   queue* elem, *tmp;
 
   QUEUE_FOR_EACH(&wdata->Q, elem, tmp) {
-    waypoint* cmp = (waypoint*) elem;
+    Waypoint* cmp = (Waypoint*) elem;
 
     /* sort out nearly equal waypoints */
     if ((compare_strings(cmp->shortname, ref->shortname) == 0) &&
@@ -1300,7 +1300,7 @@ enum_waypt_cb(const waypoint* ref)
     }
   }
 
-  wpt = new waypoint(*ref);
+  wpt = new Waypoint(*ref);
 
   if (*opt_unique == '1') {
 #if NEW_STRINGS
index 59edaaf68ad400d0219cba58528fd51c50937e0d..0e624c7e432ebb6afb90308c997bb4e6f056dd2c 100644 (file)
@@ -52,7 +52,7 @@ static gbfile* fin, *fout;
 static route_head* current_trk, *current_rte;
 static int waypoints;
 static int routepoints;
-static waypoint** wpt_a;
+static Waypoint** wpt_a;
 static int wpt_a_ct;
 static grid_type grid_index;
 static int datum_index;
@@ -130,9 +130,9 @@ typedef struct info_s {
   double speed;
   double total;
   int count;
-  waypoint* prev_wpt;
-  waypoint* first_wpt;
-  waypoint* last_wpt;
+  Waypoint* prev_wpt;
+  Waypoint* first_wpt;
+  Waypoint* last_wpt;
 } info_t;
 
 static info_t* route_info;
@@ -177,7 +177,7 @@ init_date_and_time_format(void)
 }
 
 static void
-convert_datum(const waypoint* wpt, double* dest_lat, double* dest_lon)
+convert_datum(const Waypoint* wpt, double* dest_lat, double* dest_lon)
 {
   double alt;
 
@@ -193,7 +193,7 @@ convert_datum(const waypoint* wpt, double* dest_lat, double* dest_lon)
 /* Waypoint preparation */
 
 static void
-enum_waypt_cb(const waypoint* wpt)
+enum_waypt_cb(const Waypoint* wpt)
 {
   garmin_fs_p gmsd;
   int wpt_class;
@@ -208,15 +208,15 @@ enum_waypt_cb(const waypoint* wpt)
       return;
     }
     for (i = 0; i < wpt_a_ct; i++) {           /* check for duplicates */
-      waypoint* tmp = wpt_a[i];
+      Waypoint* tmp = wpt_a[i];
       if (case_ignore_strcmp(tmp->shortname, wpt->shortname) == 0) {
-        wpt_a[i] = (waypoint*)wpt;
+        wpt_a[i] = (Waypoint*)wpt;
         waypoints--;
         return;
 
       }
     }
-    wpt_a[wpt_a_ct++] = (waypoint*)wpt;
+    wpt_a[wpt_a_ct++] = (Waypoint*)wpt;
   }
 
 }
@@ -224,8 +224,8 @@ enum_waypt_cb(const waypoint* wpt)
 static int
 sort_waypt_cb(const void* a, const void* b)
 {
-  const waypoint* wa = *(waypoint**)a;
-  const waypoint* wb = *(waypoint**)b;
+  const Waypoint* wa = *(Waypoint**)a;
+  const Waypoint* wb = *(Waypoint**)b;
 #if NEW_STRINGS
   return wa->shortname.compare(wb->shortname, Qt::CaseInsensitive);
 #else
@@ -253,18 +253,18 @@ prework_tlr_cb(const route_head* rte)
 }
 
 static void
-prework_wpt_cb(const waypoint* wpt)
+prework_wpt_cb(const Waypoint* wpt)
 {
-  waypoint* prev = cur_info->prev_wpt;
+  Waypoint* prev = cur_info->prev_wpt;
 
   if (prev != NULL) {
     cur_info->time += (wpt->GetCreationTime().toTime_t() - prev->GetCreationTime().toTime_t());
     cur_info->length += waypt_distance_ex(prev, wpt);
   } else {
-    cur_info->first_wpt = (waypoint*)wpt;
+    cur_info->first_wpt = (Waypoint*)wpt;
     cur_info->start = wpt->GetCreationTime().toTime_t();
   }
-  cur_info->prev_wpt = (waypoint*)wpt;
+  cur_info->prev_wpt = (Waypoint*)wpt;
   cur_info->count++;
   routepoints++;
 }
@@ -273,7 +273,7 @@ prework_wpt_cb(const waypoint* wpt)
 /* output helpers */
 
 static void
-print_position(const waypoint* wpt)
+print_position(const Waypoint* wpt)
 {
   int valid = 1;
   double lat, lon, north, east;
@@ -427,7 +427,7 @@ print_categories(uint16_t categories)
 }
 
 static void
-print_course(const waypoint* A, const waypoint* B)             /* seems to be okay */
+print_course(const Waypoint* A, const Waypoint* B)             /* seems to be okay */
 {
   if ((A != NULL) && (B != NULL) && (A != B)) {
     int course;
@@ -540,7 +540,7 @@ print_string(const char* fmt, const QString& string)
 /* main cb's */
 
 static void
-write_waypt(const waypoint* wpt)
+write_waypt(const Waypoint* wpt)
 {
   unsigned char wpt_class;
   garmin_fs_p gmsd;
@@ -679,9 +679,9 @@ route_disp_tlr_cb(const route_head* rte)
 }
 
 static void
-route_disp_wpt_cb(const waypoint* wpt)
+route_disp_wpt_cb(const Waypoint* wpt)
 {
-  waypoint* prev = cur_info->prev_wpt;
+  Waypoint* prev = cur_info->prev_wpt;
 
   gbfprintf(fout, "Route Waypoint\t");
   gbfprintf(fout, "%s\t", CSTRc(wpt->shortname));
@@ -698,7 +698,7 @@ route_disp_wpt_cb(const waypoint* wpt)
 
   gbfprintf(fout, "\r\n");
 
-  cur_info->prev_wpt = (waypoint*)wpt;
+  cur_info->prev_wpt = (Waypoint*)wpt;
 }
 
 static void
@@ -736,9 +736,9 @@ track_disp_tlr_cb(const route_head* track)
 }
 
 static void
-track_disp_wpt_cb(const waypoint* wpt)
+track_disp_wpt_cb(const Waypoint* wpt)
 {
-  waypoint* prev = cur_info->prev_wpt;
+  Waypoint* prev = cur_info->prev_wpt;
   time_t delta;
   double dist, depth;
 
@@ -773,7 +773,7 @@ track_disp_wpt_cb(const waypoint* wpt)
   }
   gbfprintf(fout, "\r\n");
 
-  cur_info->prev_wpt = (waypoint*)wpt;
+  cur_info->prev_wpt = (Waypoint*)wpt;
 }
 
 /*******************************************************************************
@@ -869,14 +869,14 @@ garmin_txt_write(void)
     int i;
 
     wpt_a_ct = 0;
-    wpt_a = (waypoint**)xcalloc(waypoints, sizeof(*wpt_a));
+    wpt_a = (Waypoint**)xcalloc(waypoints, sizeof(*wpt_a));
     waypt_disp_all(enum_waypt_cb);
     route_disp_all(NULL, NULL, enum_waypt_cb);
     qsort(wpt_a, waypoints, sizeof(*wpt_a), sort_waypt_cb);
 
     gbfprintf(fout, "Header\t%s\r\n\r\n", headers[waypt_header]);
     for (i = 0; i < waypoints; i++) {
-      waypoint* wpt = wpt_a[i];
+      Waypoint* wpt = wpt_a[i];
       write_waypt(wpt);
     }
     xfree(wpt_a);
@@ -1136,12 +1136,12 @@ parse_waypoint(void)
 {
   char* str;
   int column = -1;
-  waypoint* wpt;
+  Waypoint* wpt;
   garmin_fs_p gmsd = NULL;
 
   bind_fields(waypt_header);
 
-  wpt = new waypoint;
+  wpt = new Waypoint;
   gmsd = garmin_fs_alloc(-1);
   fs_chain_add(&wpt->fs, (format_specific_data*) gmsd);
 
@@ -1289,7 +1289,7 @@ parse_route_waypoint(void)
 {
   char* str;
   int column = -1;
-  waypoint* wpt = NULL;
+  Waypoint* wpt = NULL;
 
   bind_fields(rtept_header);
 
@@ -1300,7 +1300,7 @@ parse_route_waypoint(void)
       is_fatal((*str == '\0'), MYNAME ": Route waypoint without name at line %d!\n", current_line);
       wpt = find_waypt_by_name(str);
       is_fatal((wpt == NULL), MYNAME ": Route waypoint \"%s\" not in waypoint list (line %d)!\n", str, current_line);
-      wpt = new waypoint(*wpt);
+      wpt = new Waypoint(*wpt);
       break;
     }
   }
@@ -1314,10 +1314,10 @@ parse_track_waypoint(void)
 {
   char* str;
   int column = -1;
-  waypoint* wpt;
+  Waypoint* wpt;
 
   bind_fields(trkpt_header);
-  wpt = new waypoint;
+  wpt = new Waypoint;
 
   while ((str = csv_lineparse(NULL, "\t", "", column++))) {
     int field_no;
index c986237613bcd8fe5600c4532fefab4254b5400b..677fc4dba70dd9ab4809a689fbc6c57bb5043a2c 100644 (file)
@@ -255,7 +255,7 @@ format_garmin_xt_proc_strk(void)
   // Process all tracks one by one
   while ((TracksCompleted < NumberOfTracks) && (!gbfeof(fin))) {
     route_head* tmp_track;
-    waypoint*  wpt;
+    Waypoint*  wpt;
     char*      trk_name;
     trk_name = (char*) xmalloc(30);
 
@@ -293,7 +293,7 @@ format_garmin_xt_proc_strk(void)
         // Add point to the track if not the first point
         if (!FirstCoo) {
           //create new waypoint
-          wpt = new waypoint;
+          wpt = new Waypoint;
 
           //populate wpt;
           wpt->latitude = PrevLat;     /* Degrees */
@@ -319,7 +319,7 @@ format_garmin_xt_proc_strk(void)
     format_garmin_xt_decomp_last_ele(Count, &PrevEle, TrackBlock);
 
     //create new waypoint
-    wpt = new waypoint;
+    wpt = new Waypoint;
 
     //populate wpt;
     wpt->latitude = PrevLat;   /* Degrees */
@@ -342,7 +342,7 @@ format_garmin_xt_proc_atrk(void)
   uint32_t     Lat=0, Lon=0;
   uint32_t     Tim=0;
   double               LatF = 0, LonF = 0, AltF = 0;
-  waypoint*    wpt;
+  Waypoint*    wpt;
   int          method = 0;
   unsigned char        buf[3];
   int32_t      num_trackpoints;
@@ -391,7 +391,7 @@ format_garmin_xt_proc_atrk(void)
     AltF = (double)uu * GARMIN_XT_ELE - 1500;
 
     //create new waypoint
-    wpt = new waypoint;
+    wpt = new Waypoint;
 
     //populate wpt;
     wpt->latitude = LatF*180/16777216; /* Degrees */
index 1f4c1ba8a22f756ced3329f3e40f639a43111240..08582b12d00977442896c588ff34f8cfc7ab0569 100644 (file)
@@ -147,7 +147,7 @@ gdb_flush_waypt_queue(queue* Q)
   queue* elem, *tmp;
 
   QUEUE_FOR_EACH(Q, elem, tmp) {
-    waypoint* wpt = (waypoint*)elem;
+    Waypoint* wpt = (Waypoint*)elem;
     dequeue(elem);
     if (wpt->extra_data) {
 #if NEW_STRINGS
@@ -330,8 +330,8 @@ gdb_fread_strlist(void)
   return qres;
 }
 
-static waypoint*
-gdb_find_wayptq(const queue* Q, const waypoint* wpt, const char exact)
+static Waypoint*
+gdb_find_wayptq(const queue* Q, const Waypoint* wpt, const char exact)
 {
   queue* elem, *tmp;
 #if NEW_STRINGS
@@ -341,7 +341,7 @@ gdb_find_wayptq(const queue* Q, const waypoint* wpt, const char exact)
 #endif
 
   QUEUE_FOR_EACH(Q, elem, tmp) {
-    waypoint* tmp = (waypoint*)elem;
+    Waypoint* tmp = (Waypoint*)elem;
 #if NEW_STRINGS
     if (name.compare(tmp->shortname,Qt::CaseInsensitive) == 0) {
 #else
@@ -361,10 +361,10 @@ gdb_find_wayptq(const queue* Q, const waypoint* wpt, const char exact)
   return NULL;
 }
 
-static waypoint*
-gdb_reader_find_waypt(const waypoint* wpt, const char exact)
+static Waypoint*
+gdb_reader_find_waypt(const Waypoint* wpt, const char exact)
 {
-  waypoint* res;
+  Waypoint* res;
   res = gdb_find_wayptq(&wayptq_in, wpt, exact);
   if (res == NULL) {
     res = gdb_find_wayptq(&wayptq_in_hidden, wpt, exact);
@@ -372,10 +372,10 @@ gdb_reader_find_waypt(const waypoint* wpt, const char exact)
   return res;
 }
 
-static waypoint*
-gdb_add_route_waypt(route_head* rte, waypoint* ref, const int wpt_class)
+static Waypoint*
+gdb_add_route_waypt(route_head* rte, Waypoint* ref, const int wpt_class)
 {
-  waypoint* tmp, *res;
+  Waypoint* tmp, *res;
   int turn_point;
 
   tmp = gdb_reader_find_waypt(ref, 1);
@@ -411,7 +411,7 @@ gdb_add_route_waypt(route_head* rte, waypoint* ref, const int wpt_class)
   turn_point = (gdb_roadbook && (wpt_class > gt_waypt_class_map_point) && tmp->description);
 #endif
   if (turn_point || (gdb_via == 0) || (wpt_class < gt_waypt_class_map_point)) {
-    res = new waypoint(*tmp);
+    res = new Waypoint(*tmp);
     route_add_wpt(rte, res);
   }
   delete ref;
@@ -537,14 +537,14 @@ read_file_header(void)
 
 /*-----------------------------------------------------------------------------*/
 
-static waypoint*
+static Waypoint*
 read_waypoint(gt_waypt_classes_e* waypt_class_out)
 {
   char buf[128];               /* used for temporary stuff */
   int display, icon, dynamic;
   gt_waypt_classes_e wpt_class;
   int i;
-  waypoint* res;
+  Waypoint* res;
   garmin_fs_t* gmsd;
   char* str;
   char* bufp = buf;
@@ -555,7 +555,7 @@ read_waypoint(gt_waypt_classes_e* waypt_class_out)
   char* sn;
 #endif
   waypt_ct++;
-  res = new waypoint;
+  res = new Waypoint;
 
   gmsd = garmin_fs_alloc(-1);
   fs_chain_add(&res->fs, (format_specific_data*) gmsd);
@@ -837,9 +837,9 @@ read_route(void)
     char buf[128];
     garmin_ilink_t* il_root, *il_anchor;
 
-    waypoint* wpt;
+    Waypoint* wpt;
 
-    wpt = new waypoint;
+    wpt = new Waypoint;
     rtept_ct++;
 
     wpt->shortname = fread_cstr();     /* shortname */
@@ -934,10 +934,10 @@ read_route(void)
 
     if (links == 0) {
       /* Without links we need all informations from wpt */
-      waypoint* tmp = gdb_reader_find_waypt(wpt, 0);
+      Waypoint* tmp = gdb_reader_find_waypt(wpt, 0);
       if (tmp != NULL) {
         delete wpt;
-        wpt = new waypoint(*tmp);
+        wpt = new Waypoint(*tmp);
       } else {
         if (waypt_bounds_valid(&bounds)) {
           warning(MYNAME ": (has bounds)\n");
@@ -1029,7 +1029,7 @@ read_track(void)
   points = FREAD_i32;
 
   for (index = 0; index < points; index++) {
-    waypoint* wpt = new waypoint;
+    Waypoint* wpt = new Waypoint;
 
     trkpt_ct++;
 
@@ -1118,7 +1118,7 @@ read_data(void)
     int len, delta;
     char typ, dump;
     gt_waypt_classes_e wpt_class;
-    waypoint* wpt;
+    Waypoint* wpt;
     route_head* trk, *rte;
 
     len = FREAD_i32;
@@ -1144,9 +1144,9 @@ read_data(void)
     case 'W':
       wpt = read_waypoint(&wpt_class);
       if ((gdb_via == 0) || (wpt_class == 0)) {
-        waypoint* dupe;
+        Waypoint* dupe;
         waypt_add(wpt);
-        dupe = new waypoint(*wpt);
+        dupe = new Waypoint(*wpt);
         ENQUEUE_TAIL(&wayptq_in, &dupe->Q);
       } else {
         ENQUEUE_TAIL(&wayptq_in_hidden, &wpt->Q);
@@ -1321,7 +1321,7 @@ write_header(void)
  */
 
 static void
-gdb_check_waypt(waypoint* wpt)
+gdb_check_waypt(Waypoint* wpt)
 {
   double lat_orig = wpt->latitude;
   double lon_orig = wpt->longitude;
@@ -1358,9 +1358,9 @@ gdb_check_waypt(waypoint* wpt)
 static void
 write_waypoint(
 #if NEW_STRINGS
-  const waypoint* wpt, const QString& shortname, garmin_fs_t* gmsd,
+  const Waypoint* wpt, const QString& shortname, garmin_fs_t* gmsd,
 #else
-  const waypoint* wpt, const char* shortname, garmin_fs_t* gmsd,
+  const Waypoint* wpt, const char* shortname, garmin_fs_t* gmsd,
 #endif
   const int icon, const int display)
 {
@@ -1503,7 +1503,7 @@ route_compute_bounds(const route_head* rte, bounds* bounds)
   queue* elem, *tmp;
   waypt_init_bounds(bounds);
   QUEUE_FOR_EACH((queue*)&rte->waypoint_list, elem, tmp) {
-    waypoint* wpt = (waypoint*)elem;
+    Waypoint* wpt = (Waypoint*)elem;
     gdb_check_waypt(wpt);
     waypt_add_to_bounds(bounds, wpt);
   }
@@ -1549,9 +1549,9 @@ write_route(const route_head* rte, const QString& rte_name)
 
   QUEUE_FOR_EACH((queue*)&rte->waypoint_list, elem, tmp) {
 
-    waypoint* wpt = (waypoint*)elem;
-    waypoint* next = (waypoint*)tmp;
-    waypoint* test;
+    Waypoint* wpt = (Waypoint*)elem;
+    Waypoint* next = (Waypoint*)tmp;
+    Waypoint* test;
     garmin_fs_t* gmsd = NULL;
     int wpt_class;
 
@@ -1655,7 +1655,7 @@ write_track(const route_head* trk, const QString& trk_name)
 
   QUEUE_FOR_EACH((queue*)&trk->waypoint_list, elem, tmp) {
     double d;
-    waypoint* wpt = (waypoint*)elem;
+    Waypoint* wpt = (Waypoint*)elem;
 
     trkpt_ct++;        /* increase informational number of written route points */
 
@@ -1721,18 +1721,18 @@ str_not_equal(const char* s1, const char* s2)
 #endif
 
 static void
-write_waypoint_cb(const waypoint* refpt)
+write_waypoint_cb(const Waypoint* refpt)
 {
   garmin_fs_t* gmsd;
-  waypoint* test;
+  Waypoint* test;
   gbfile* fsave;
 
   /* do this when backup always happens in main */
 #if NEW_STRINGS
 // but, but, casting away the const here is wrong...
-  ((waypoint*)refpt)->shortname = refpt->shortname.trimmed();
+  ((Waypoint*)refpt)->shortname = refpt->shortname.trimmed();
 #else
-  rtrim(((waypoint*)refpt)->shortname);
+  rtrim(((Waypoint*)refpt)->shortname);
 #endif
   test = gdb_find_wayptq(&wayptq_out, refpt, 1);
 
@@ -1761,7 +1761,7 @@ write_waypoint_cb(const waypoint* refpt)
 #else
     char* name;
 #endif
-    waypoint* wpt = new waypoint(*refpt);
+    Waypoint* wpt = new Waypoint(*refpt);
 
     gdb_check_waypt(wpt);
     ENQUEUE_TAIL(&wayptq_out, &wpt->Q);
index d9367666b25991d5cb1a9a23fc1bed92453e4e42..f86548f334c9644f2252a3df36c6c1b772e35315 100644 (file)
@@ -49,7 +49,7 @@ geocache_container wpt_container(const QString&);
 
 void GeoReadLoc()
 {
-  waypoint* wpt = NULL;
+  Waypoint* wpt = NULL;
   QString current_tag;
 
   while (!reader.atEnd()) {
@@ -58,7 +58,7 @@ void GeoReadLoc()
       current_tag.append("/");
       current_tag.append(tag_name);
       if (current_tag == "/loc/waypoint") {
-        wpt = new waypoint;
+        wpt = new Waypoint;
         wpt->AllocGCData();
         // There is no 'unknown' alt value and so many reference files have
         // leaked it that we just paper over that here.
@@ -181,7 +181,7 @@ geo_wr_deinit(void)
 }
 
 static void
-geo_waypt_pr(const waypoint* waypointp)
+geo_waypt_pr(const Waypoint* waypointp)
 {
   writer.writeStartElement("waypoint");
 
index a81a4ed76e77611c4c5e811199954b2926ac0967..ab4f45d64108e1a10a6dcd56c7a7d4c5389ab3ab 100644 (file)
@@ -111,7 +111,7 @@ ggv_log_read(void)
     double xlat, xlon;
     float sec;
     struct tm tm;
-    waypoint* wpt;
+    Waypoint* wpt;
 
     if (len != bufsz) {
       break;
@@ -124,7 +124,7 @@ ggv_log_read(void)
 
     memset(&tm, 0, sizeof(tm));
 
-    wpt = new waypoint;
+    wpt = new Waypoint;
 
     deg = (int16_t) le_read16(&buf[0]);
     min = le_read16(&buf[2]);
@@ -206,14 +206,14 @@ static void
 ggv_log_track_head_cb(const route_head* trk)
 {
   queue* elem, *tmp;
-  waypoint* prev = NULL;
+  Waypoint* prev = NULL;
 
   QUEUE_FOR_EACH((queue*)&trk->waypoint_list, elem, tmp) {
     double  latmin, lonmin, latsec, lonsec;
     int     latint, lonint;
     double  course = 0, speed = 0;
     struct tm tm;
-    waypoint* wpt = (waypoint*)elem;
+    Waypoint* wpt = (Waypoint*)elem;
     double secs = 0;
 
     latint = wpt->latitude;
index bf6ce7880e459e97e08bb249f56b46eda19b2bbf..80318bf52c8ccf2395cbf83c8d8a1bee9ba9cacb 100644 (file)
@@ -118,7 +118,7 @@ ggv_ovl_read(void)
     switch (type) {
 
       char coord[32];
-      waypoint* wpt;
+      Waypoint* wpt;
       char* cx;
       int group;
 
@@ -146,7 +146,7 @@ ggv_ovl_read(void)
 
         for (j = 0; j < points; j++) {
 
-          wpt = new waypoint;
+          wpt = new Waypoint;
 
           snprintf(coord, sizeof(coord), "YKoord%d", j);
           if ((cx = inifile_readstr(inifile, symbol, coord))) {
@@ -174,7 +174,7 @@ ggv_ovl_read(void)
     case OVL_SYMBOL_CIRCLE:
     case OVL_SYMBOL_TRIANGLE:
 
-      wpt = new waypoint;
+      wpt = new Waypoint;
       wpt->shortname = symbol;
 
       if ((cx = inifile_readstr(inifile, symbol, "YKoord"))) {
@@ -203,12 +203,12 @@ ggv_ovl_read(void)
 
 /* prototypes used in main functions */
 
-static void waypt_disp_cb(const waypoint* wpt);
+static void waypt_disp_cb(const Waypoint* wpt);
 static void track_disp_cb(const route_head* trk);
 static void route_disp_cb(const route_head* rte);
 static void write_bounds(void);
-static void draw_symbol_basics(const OVL_SYMBOL_TYP typ, const int art, const OVL_COLOR_TYP color, const waypoint* wpt);
-static int get_direction(const waypoint* A, const waypoint* B);
+static void draw_symbol_basics(const OVL_SYMBOL_TYP typ, const int art, const OVL_COLOR_TYP color, const Waypoint* wpt);
+static int get_direction(const Waypoint* A, const Waypoint* B);
 // static void draw_symbol_text(const char *text, const waypoint *reference);
 
 /* -----------------------------------------------------------------------*/
@@ -255,7 +255,7 @@ ggv_ovl_write(void)
 /**************************************************************************/
 
 static void
-waypt_disp_cb(const waypoint* wpt)
+waypt_disp_cb(const Waypoint* wpt)
 {
   draw_symbol_basics(OVL_SYMBOL_CIRCLE, 1, color, wpt);
   gbfprintf(fout, "Width=20\n");
@@ -290,7 +290,7 @@ track_disp_cb(const route_head* trk)
 
   QUEUE_FOR_EACH(&(trk->waypoint_list), elem, tmp) {
 
-    waypoint* wpt = (waypoint*) elem;
+    Waypoint* wpt = (Waypoint*) elem;
 
     gbfprintf(fout, "XKoord%d=%0.8f\n", i, wpt->longitude);
     gbfprintf(fout, "YKoord%d=%0.8f\n", i, wpt->latitude);
@@ -306,7 +306,7 @@ route_disp_cb(const route_head* rte)
 {
   int i;
   queue* elem, *tmp;
-  waypoint* prev;
+  Waypoint* prev;
   int waypt_ct = rte->rte_waypt_ct;
 
   if (waypt_ct <= 0) {
@@ -322,7 +322,7 @@ route_disp_cb(const route_head* rte)
 
   QUEUE_FOR_EACH(&(rte->waypoint_list), elem, tmp) {
 
-    waypoint* wpt = (waypoint*) elem;
+    Waypoint* wpt = (Waypoint*) elem;
 
     if (prev != NULL) {
       draw_symbol_basics(OVL_SYMBOL_TRIANGLE, 1, (OVL_COLOR_TYP)9 /* color */, prev);
@@ -343,7 +343,7 @@ route_disp_cb(const route_head* rte)
 /* -----------------------------------------------------------------------*/
 
 static void
-waypt_bound_calc(const waypoint* waypointp)
+waypt_bound_calc(const Waypoint* waypointp)
 {
   waypt_add_to_bounds(&all_bounds, waypointp);
 }
@@ -371,7 +371,7 @@ write_bounds(void)
 }
 
 static void
-draw_symbol_basics(const OVL_SYMBOL_TYP typ, const int art, const OVL_COLOR_TYP color, const waypoint* wpt)
+draw_symbol_basics(const OVL_SYMBOL_TYP typ, const int art, const OVL_COLOR_TYP color, const Waypoint* wpt)
 {
   symbol_ct++;
 
@@ -391,7 +391,7 @@ draw_symbol_basics(const OVL_SYMBOL_TYP typ, const int art, const OVL_COLOR_TYP
 /* the following code comes from first overlay module */
 
 static int
-get_direction(const waypoint* A, const waypoint* B)
+get_direction(const Waypoint* A, const Waypoint* B)
 {
   double lata, lona, latb, lonb;
   double dist, dir;
@@ -420,9 +420,9 @@ get_direction(const waypoint* A, const waypoint* B)
 
 #if 0
 static void
-draw_symbol_text(const char* text, const waypoint* reference)
+draw_symbol_text(const char* text, const Waypoint* reference)
 {
-  waypoint wpt;
+  Waypoint wpt;
 
   if ((reference == NULL) || (text == NULL)) {
     return;
index 2aa0d0eea13de90f56545a8031c9f666052cafd0..129dca827256d62c30be5fb989ad73709d3af618 100644 (file)
@@ -30,7 +30,7 @@ static gbfile* ofd;
 static QString ostring;
 static QXmlStreamWriter writer(&ostring);
 
-static waypoint* wpt_tmp;
+static Waypoint* wpt_tmp;
 static route_head* trk_head;
 
 #define MYNAME "glogbook"
@@ -97,7 +97,7 @@ glogbook_wr_deinit(void)
 }
 
 static void
-glogbook_waypt_pr(const waypoint* wpt)
+glogbook_waypt_pr(const Waypoint* wpt)
 {
   writer.writeStartElement("Trackpoint");
 
@@ -147,7 +147,7 @@ void        gl_trk_s(xg_string args, const QXmlStreamAttributes* unused)
 
 void   gl_trk_pnt_s(xg_string args, const QXmlStreamAttributes* unused)
 {
-  wpt_tmp = new waypoint;
+  wpt_tmp = new Waypoint;
 }
 
 void   gl_trk_pnt_e(xg_string args, const QXmlStreamAttributes* unused)
index 36d4bde705d26e549ebfb5cab60d591e6d9966c1..d115a1bf424857da9371f3d6acbcd62c43095593 100644 (file)
@@ -92,13 +92,13 @@ gnav_trl_read(void)
 
   while (! gbfeof(fin)) {
     gnav_trl_t rec;
-    waypoint* wpt;
+    Waypoint* wpt;
 
     if (gbfread(&rec, sizeof(rec), 1, fin) != 1) {
       fatal(MYNAME ": Unexpected EOF (end of file)!\n");
     }
 
-    wpt = new waypoint;
+    wpt = new Waypoint;
 
     wpt->SetCreationTime(le_read32(&rec.time));
     wpt->latitude = le_read_float(&rec.lat);
@@ -114,7 +114,7 @@ gnav_trl_read(void)
 }
 
 static void
-gnav_trl_write_trkpt(const waypoint* wpt)
+gnav_trl_write_trkpt(const Waypoint* wpt)
 {
   gnav_trl_t rec;
 
index 9970cbd26b1b67dfaae81289f1ef8cc70b669837..d3343d00ae8866d7ac114df85880b025ebd76235 100644 (file)
@@ -120,7 +120,7 @@ void goog_segment_s(xg_string args, const QXmlStreamAttributes* attrv)
 
 void goog_segment(xg_string args, const QXmlStreamAttributes* unused)
 {
-  waypoint* wpt_tmp;
+  Waypoint* wpt_tmp;
 
   wpt_tmp = route_find_waypt_by_name(routehead[goog_segroute], goog_segname);
   if (wpt_tmp) {
@@ -243,7 +243,7 @@ void goog_poly_e(xg_string args, const QXmlStreamAttributes* unused)
     }
 
     {
-      waypoint* wpt_tmp = new waypoint;
+      Waypoint* wpt_tmp = new Waypoint;
       wpt_tmp->latitude = lat / 100000.0;
       wpt_tmp->longitude = lon / 100000.0;
       wpt_tmp->route_priority=level;
index 66e92f9f9930756f380d462e9fe87c3ad0a35c9e..1ee669b6f91cc12088404c4cb8161b024e9cbe71 100644 (file)
@@ -126,7 +126,7 @@ goog_poly_e(xg_string args, const QXmlStreamAttributes* unused)
     lon += decode_goog64(&str);
 
     {
-      waypoint* wpt_tmp = new waypoint;
+      Waypoint* wpt_tmp = new Waypoint;
       wpt_tmp->latitude = lat / 100000.0;
       wpt_tmp->longitude = lon / 100000.0;
       /* FIXME no need for name
index 06293a7351f4c85b560444da687172f41be1ff70..4b69dd43c31513198c3ee01019159aa93d2706a2 100644 (file)
@@ -1,7 +1,7 @@
 /*
 
 
-       Copyright (C) 2008  Dr. Jürgen Neumann, Juergen.Neumann@online.de
+       Copyright (C) 2008  Dr. Jrgen Neumann, Juergen.Neumann@online.de
        Copyright (C) 2005  Robert Lipe, robertlipe@usa.net (based on nmea.c)
        Copyright (C) 20XX  probably many others from the gpsbabel development team ;-)
 
@@ -175,7 +175,7 @@ gopal_read(void)
   double hmsd,speed;
   int fix, hms;
   route_head* route;
-  waypoint* wpt, *lastwpt=NULL;
+  Waypoint* wpt, *lastwpt=NULL;
   double long_old,lat_old;
   char tbuffer[64];
   struct tm tm2;
@@ -206,7 +206,7 @@ gopal_read(void)
     if ((nfields == 8) && (tx == 0)) {
       // fatal(MYNAME ": Invalid date in filename \"%s\", try to set manually using \"date\" switch!\n", buff);
     }
-    wpt = new waypoint;
+    wpt = new Waypoint;
 
     column = -1;
     // the format of gopal is quite simple. Unfortunately the developers forgot the date as the first element...
@@ -333,7 +333,7 @@ gopal_read(void)
       long_old=wpt->longitude;
       lat_old=wpt->latitude;
       route_add_wpt(route,wpt);
-      waypt_add(new waypoint(*wpt));
+      waypt_add(new Waypoint(*wpt));
     }
   }
 }
@@ -350,7 +350,7 @@ gopal_route_tlr(const route_head* rte)
 }
 
 static void
-gopal_write_waypt(const waypoint* wpt)
+gopal_write_waypt(const Waypoint* wpt)
 {
   char tbuffer[64];
   unsigned long timestamp;
index 87976811cf2585a1ffe47bd71feb6c23dc672579..cb50e7ed6d844411d78a2266bec0138671ff07da 100644 (file)
@@ -103,7 +103,7 @@ gpssim_write_spd(double knotsperhour)
 }
 
 static void
-gpssim_write_pt(const waypoint* wpt)
+gpssim_write_pt(const Waypoint* wpt)
 {
   char obuf[1024];
   double lat, lon;
index 264750a0cc096376372eb9882a5ef1a25a347692..c50245f8fc64e5f5879c32551c27c9d176f9494c 100644 (file)
@@ -66,7 +66,7 @@ data_read(void)
   long alt;
   char alttype;
   char icon[3];
-  waypoint* wpt_tmp;
+  Waypoint* wpt_tmp;
   int line = 0;
   /*
    * Make sure that all waypoints in single read have same
@@ -110,7 +110,7 @@ data_read(void)
     rtrim(sn);
     rtrim(desc);
     rtrim(icon);
-    wpt_tmp = new waypoint;
+    wpt_tmp = new Waypoint;
     wpt_tmp->altitude = alt;
     wpt_tmp->shortname = sn;
     xfree(sn);
@@ -136,7 +136,7 @@ data_read(void)
 }
 
 static void
-gpsutil_disp(const waypoint* wpt)
+gpsutil_disp(const Waypoint* wpt)
 {
   double lon,lat;
   QString icon_token;
index 4c4bdf4d17ec3247d9a675fda80fa329387e21eb..d9063be5771b4a2ccbc011c5fb00e84c4ff01c98 100644 (file)
@@ -48,7 +48,7 @@ static QXmlStreamAttributes gpx_namespace_attribute;
 
 static QString current_tag;
 
-static waypoint* wpt_tmp;
+static Waypoint* wpt_tmp;
 static UrlLink* link_;
 static int cache_descr_is_html;
 static gpsbabel::File* iqfile;
@@ -490,7 +490,7 @@ tag_gpx(const QXmlStreamAttributes& attr)
 static void
 tag_wpt(const QXmlStreamAttributes& attr)
 {
-  wpt_tmp = new waypoint;
+  wpt_tmp = new Waypoint;
   link_ = new UrlLink;
 
   cur_tag = NULL;
@@ -608,7 +608,7 @@ static void
 tag_log_wpt(const QXmlStreamAttributes& attr)
 {
   /* create a new waypoint */
-  waypoint* lwp_tmp = new waypoint;
+  Waypoint* lwp_tmp = new Waypoint;
 
   /* extract the lat/lon attributes */
   if (attr.hasAttribute("lat")) {
@@ -1334,7 +1334,7 @@ write_tag_attributes(xml_tag* tag)
 }
 
 static void
-fprint_xml_chain(xml_tag* tag, const waypoint* wpt)
+fprint_xml_chain(xml_tag* tag, const Waypoint* wpt)
 {
   while (tag) {
     writer->writeStartElement(tag->tagname);
@@ -1397,7 +1397,7 @@ void free_gpx_extras(xml_tag* tag)
  * Handle the grossness of GPX 1.0 vs. 1.1 handling of linky links.
  */
 static void
-write_gpx_url(const waypoint* waypointp)
+write_gpx_url(const Waypoint* waypointp)
 {
   if (!waypointp->HasUrlLink()) {
     return;
@@ -1423,7 +1423,7 @@ write_gpx_url(const waypoint* waypointp)
  * Order counts.
  */
 static void
-gpx_write_common_acc(const waypoint* waypointp)
+gpx_write_common_acc(const Waypoint* waypointp)
 {
   const char* fix = NULL;
 
@@ -1468,7 +1468,7 @@ gpx_write_common_acc(const waypoint* waypointp)
 
 
 static void
-gpx_write_common_position(const waypoint* waypointp)
+gpx_write_common_position(const Waypoint* waypointp)
 {
   if (waypointp->altitude != unknown_alt) {
     writer->writeTextElement("ele", QString::number(waypointp->altitude, 'f', 6));
@@ -1478,7 +1478,7 @@ gpx_write_common_position(const waypoint* waypointp)
 }
 
 static void
-gpx_write_common_extensions(const waypoint* waypointp, const gpx_point_type point_type)
+gpx_write_common_extensions(const Waypoint* waypointp, const gpx_point_type point_type)
 {
   // gpx version we are writing is >= 1.1.
   if ((opt_humminbirdext && (WAYPT_HAS(waypointp, depth) || WAYPT_HAS(waypointp, temperature))) ||
@@ -1546,7 +1546,7 @@ gpx_write_common_extensions(const waypoint* waypointp, const gpx_point_type poin
 }
 
 static void
-gpx_write_common_description(const waypoint* waypointp, QString oname)
+gpx_write_common_description(const Waypoint* waypointp, QString oname)
 {
   writer->writeOptionalTextElement("name", oname);
 
@@ -1566,7 +1566,7 @@ gpx_write_common_description(const waypoint* waypointp, QString oname)
 }
 
 static void
-gpx_waypt_pr(const waypoint* waypointp)
+gpx_waypt_pr(const Waypoint* waypointp)
 {
   QString oname;
   fs_xml* fs_gpx;
@@ -1630,7 +1630,7 @@ gpx_track_hdr(const route_head* rte)
 }
 
 static void
-gpx_track_disp(const waypoint* waypointp)
+gpx_track_disp(const Waypoint* waypointp)
 {
   fs_xml* fs_gpx;
   int first_in_trk;
@@ -1727,7 +1727,7 @@ gpx_route_hdr(const route_head* rte)
 }
 
 static void
-gpx_route_disp(const waypoint* waypointp)
+gpx_route_disp(const Waypoint* waypointp)
 {
 #if NEW_STRINGS 
   QString oname;
@@ -1771,7 +1771,7 @@ void gpx_route_pr()
 }
 
 static void
-gpx_waypt_bound_calc(const waypoint* waypointp)
+gpx_waypt_bound_calc(const Waypoint* waypointp)
 {
   waypt_add_to_bounds(&all_bounds, waypointp);
 }
index 6f0f82f7c30fd2ed4ce31a0d17b2c12c20bacc41..7075432b6c44090c49ffa5afee3d940a9ecf8bcf 100644 (file)
@@ -436,11 +436,11 @@ gtm_rd_deinit(void)
   gbfclose(file_in);
 }
 
-static void count_route_waypts(const waypoint* wpt)
+static void count_route_waypts(const Waypoint* wpt)
 {
   rt_count++;
 }
-static void count_track_waypts(const waypoint* wpt)
+static void count_track_waypts(const Waypoint* wpt)
 {
   tr_count++;
 }
@@ -512,7 +512,7 @@ gtm_read(void)
   route_head* first_trk_head = NULL;
   route_head* trk_head = NULL;
   route_head* rte_head = NULL;
-  waypoint* wpt;
+  Waypoint* wpt;
   int real_tr_count = 0;
   unsigned int icon;
   int i;
@@ -526,7 +526,7 @@ gtm_read(void)
 
   /* Waypoints */
   for (i = 0; i != wp_count; i++) {
-    wpt = new waypoint;
+    wpt = new Waypoint;
     wpt->latitude = fread_double(file_in);
     wpt->longitude = fread_double(file_in);
     convert_datum(&wpt->latitude, &wpt->longitude);
@@ -561,7 +561,7 @@ gtm_read(void)
 
   /* Tracklogs */
   for (i = 0; i != tr_count; i++) {
-    wpt = new waypoint;
+    wpt = new Waypoint;
     wpt->latitude = fread_double(file_in);
     wpt->longitude = fread_double(file_in);
     convert_datum(&wpt->latitude, &wpt->longitude);
@@ -595,7 +595,7 @@ gtm_read(void)
 
   /* Routes */
   for (i = 0; i != rt_count; i++) {
-    wpt = new waypoint;
+    wpt = new Waypoint;
     wpt->latitude = fread_double(file_in);
     wpt->longitude = fread_double(file_in);
     convert_datum(&wpt->latitude, &wpt->longitude);
@@ -634,7 +634,7 @@ static int icon_from_descr(const QString& descr)
   return 48;
 }
 
-static void write_waypt(const waypoint* wpt)
+static void write_waypt(const Waypoint* wpt)
 {
   fwrite_double(file_out, wpt->latitude);
   fwrite_double(file_out, wpt->longitude);
@@ -662,7 +662,7 @@ static void start_rte(const route_head* rte)
   start_new = 1;
 }
 
-static void write_trk_waypt(const waypoint* wpt)
+static void write_trk_waypt(const Waypoint* wpt)
 {
   fwrite_double(file_out, wpt->latitude);
   fwrite_double(file_out, wpt->longitude);
@@ -686,7 +686,7 @@ static void write_trk_style(const route_head* trk)
   fwrite_integer(file_out, 0);
 }
 
-static void write_rte_waypt(const waypoint* wpt)
+static void write_rte_waypt(const Waypoint* wpt)
 {
   fwrite_double(file_out, wpt->latitude);
   fwrite_double(file_out, wpt->longitude);
index ac9de4626cc42de6d79c5186e795ebe0ba38bbe9..4f3456ddb342bf2c19624ecbab62fa180e09e70a 100644 (file)
@@ -27,7 +27,7 @@
 static gbfile* ofd;
 static int lap_ct = 0;
 static int lap_s = 0;
-static waypoint* wpt_tmp;
+static Waypoint* wpt_tmp;
 static route_head* trk_head;
 static computed_trkdata* tdata;
 
@@ -255,7 +255,7 @@ gtc_new_study_lap(const route_head* rte)
 }
 
 static void
-gtc_study_lap(const waypoint* wpt)
+gtc_study_lap(const Waypoint* wpt)
 {
   if (wpt->creation_time.isValid() && (!gtc_least_time.isValid())) {
     gtc_least_time = wpt->GetCreationTime();
@@ -276,7 +276,7 @@ gtc_study_lap(const waypoint* wpt)
 }
 
 static void
-gtc_waypt_pr(const waypoint* wpt)
+gtc_waypt_pr(const Waypoint* wpt)
 {
   if (wpt->wpt_flags.is_split != 0) {
     gtc_write_xml(1, "<Trackpoint split=\"yes\">\n");
@@ -493,7 +493,7 @@ gtc_trk_lap_e(xg_string unused, const QXmlStreamAttributes* unusedattrs)
 void
 gtc_trk_pnt_s(xg_string unused, const QXmlStreamAttributes* unusedattrs)
 {
-  wpt_tmp = new waypoint;
+  wpt_tmp = new Waypoint;
 }
 
 void
@@ -504,7 +504,7 @@ gtc_trk_pnt_e(xg_string args, const QXmlStreamAttributes* unused)
       /* Add the first point of an ActivityLap as
       a waypoint as well as a trackpoint. */
       char cbuf[10];
-      waypoint* wpt_lap_s = new waypoint(*wpt_tmp);
+      Waypoint* wpt_lap_s = new Waypoint(*wpt_tmp);
       snprintf(cbuf, sizeof(cbuf), "LAP%03d", lap_ct);
       wpt_lap_s->shortname = cbuf;
       waypt_add(wpt_lap_s);
@@ -626,7 +626,7 @@ gtc_wpt_crs_s(const QString& args, const QXmlStreamAttributes* unused)
 gtc_wpt_crs_s(const char* unused, const QXmlStreamAttributes* unusedattrs)
 #endif
 {
-  wpt_tmp = new waypoint;
+  wpt_tmp = new Waypoint;
 }
 
 void
@@ -644,7 +644,7 @@ gtc_wpt_crs_e(xg_string args, const QXmlStreamAttributes* unused)
 void
 gtc_wpt_pnt_s(xg_string unused, const QXmlStreamAttributes* unusedattrs)
 {
-  wpt_tmp = new waypoint;
+  wpt_tmp = new Waypoint;
   lap_ct++;
 }
 
index c46d8bb2c5dc395b135cd8e788bfb89dccf8e8be..1d69d334c6eb0fad57933a5ea1bb7e285707a66a 100644 (file)
@@ -181,12 +181,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FileDlgManager</name>
     <message>
-        <location filename="optionsdlg.cc" line="70"/>
+        <location filename="optionsdlg.cc" line="73"/>
         <source>Select input file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="optionsdlg.cc" line="75"/>
+        <location filename="optionsdlg.cc" line="77"/>
         <source>Select output file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -417,8 +417,8 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="mainwinui.ui" line="44"/>
-        <location filename="mainwinui.ui" line="428"/>
-        <location filename="mainwinui.ui" line="632"/>
+        <location filename="mainwinui.ui" line="438"/>
+        <location filename="mainwinui.ui" line="642"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -429,13 +429,13 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="mainwinui.ui" line="60"/>
-        <location filename="mainwinui.ui" line="444"/>
+        <location filename="mainwinui.ui" line="454"/>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwinui.ui" line="89"/>
-        <location filename="mainwinui.ui" line="473"/>
+        <location filename="mainwinui.ui" line="483"/>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -461,7 +461,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="mainwinui.ui" line="162"/>
-        <location filename="mainwinui.ui" line="543"/>
+        <location filename="mainwinui.ui" line="553"/>
         <source>Device Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -477,301 +477,301 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="mainwinui.ui" line="203"/>
-        <location filename="mainwinui.ui" line="584"/>
+        <location filename="mainwinui.ui" line="594"/>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="218"/>
+        <location filename="mainwinui.ui" line="228"/>
         <source>Translation Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="227"/>
-        <location filename="mainwinui.ui" line="270"/>
-        <location filename="mainwinui.ui" line="310"/>
+        <location filename="mainwinui.ui" line="237"/>
+        <location filename="mainwinui.ui" line="280"/>
+        <location filename="mainwinui.ui" line="320"/>
         <source>-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="237"/>
+        <location filename="mainwinui.ui" line="247"/>
         <source>If selected, translate waypoints.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="240"/>
+        <location filename="mainwinui.ui" line="250"/>
         <source>Waypoints</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="277"/>
+        <location filename="mainwinui.ui" line="287"/>
         <source>If selected, translate routes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="280"/>
+        <location filename="mainwinui.ui" line="290"/>
         <source>Routes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="317"/>
+        <location filename="mainwinui.ui" line="327"/>
         <source>If selected, translate tracks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="320"/>
+        <location filename="mainwinui.ui" line="330"/>
         <source>Tracks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="356"/>
+        <location filename="mainwinui.ui" line="366"/>
         <source>Data Filters between input and output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="359"/>
+        <location filename="mainwinui.ui" line="369"/>
         <source>Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="392"/>
+        <location filename="mainwinui.ui" line="402"/>
         <source>More translation options. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="395"/>
+        <location filename="mainwinui.ui" line="405"/>
         <source>More Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="405"/>
+        <location filename="mainwinui.ui" line="415"/>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="425"/>
+        <location filename="mainwinui.ui" line="435"/>
         <source>If selected, output is to a file. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="441"/>
+        <location filename="mainwinui.ui" line="451"/>
         <source>If selected, output is to a device or GPS unit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="480"/>
+        <location filename="mainwinui.ui" line="490"/>
         <source>Output data format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="487"/>
+        <location filename="mainwinui.ui" line="497"/>
         <source>Character encoding of output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="508"/>
+        <location filename="mainwinui.ui" line="518"/>
         <source>Browse for an output file name. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="511"/>
+        <location filename="mainwinui.ui" line="521"/>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="550"/>
+        <location filename="mainwinui.ui" line="560"/>
         <source>Name of port to which output device is connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="581"/>
+        <location filename="mainwinui.ui" line="591"/>
         <source>Options for the selected output format. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="605"/>
+        <location filename="mainwinui.ui" line="615"/>
         <source>Output of GPSBabel translation process. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="639"/>
+        <location filename="mainwinui.ui" line="649"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="655"/>
+        <location filename="mainwinui.ui" line="665"/>
         <source>GPSBabel Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="660"/>
+        <location filename="mainwinui.ui" line="670"/>
         <source>About GPSBabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="665"/>
+        <location filename="mainwinui.ui" line="675"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="670"/>
+        <location filename="mainwinui.ui" line="680"/>
         <source>Preferences...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="675"/>
+        <location filename="mainwinui.ui" line="685"/>
         <source>Check for Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="680"/>
+        <location filename="mainwinui.ui" line="690"/>
         <source>Visit Website...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="685"/>
+        <location filename="mainwinui.ui" line="695"/>
         <source>Make a Donation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="386"/>
-        <location filename="mainwindow.cc" line="387"/>
+        <location filename="mainwindow.cc" line="396"/>
+        <location filename="mainwindow.cc" line="397"/>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="560"/>
+        <location filename="mainwindow.cc" line="570"/>
         <source>Select one or more input files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="587"/>
+        <location filename="mainwindow.cc" line="597"/>
         <source>Output File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="647"/>
+        <location filename="mainwindow.cc" line="657"/>
         <source>Error reading format configuration.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="658"/>
+        <location filename="mainwindow.cc" line="668"/>
         <source>Some file/device formats were not found during initialization.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="680"/>
+        <location filename="mainwindow.cc" line="690"/>
         <source>Input and output formats do not support %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="683"/>
+        <location filename="mainwindow.cc" line="693"/>
         <source>Input does not support %1; output format supports %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="686"/>
+        <location filename="mainwindow.cc" line="696"/>
         <source>Input format supports %1; output format does not support %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="689"/>
+        <location filename="mainwindow.cc" line="699"/>
         <source>Both input and output formats support %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="710"/>
+        <location filename="mainwindow.cc" line="720"/>
         <source>waypoints</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="711"/>
+        <location filename="mainwindow.cc" line="721"/>
         <source>tracks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="712"/>
+        <location filename="mainwindow.cc" line="722"/>
         <source>routes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="802"/>
+        <location filename="mainwindow.cc" line="812"/>
         <source>There are no input options for format &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="809"/>
-        <location filename="mainwindow.cc" line="829"/>
+        <location filename="mainwindow.cc" line="819"/>
+        <location filename="mainwindow.cc" line="839"/>
         <source>Options for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="822"/>
+        <location filename="mainwindow.cc" line="832"/>
         <source>There are no output options for format &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="843"/>
+        <location filename="mainwindow.cc" line="853"/>
         <source>No valid waypoints/routes/tracks translation specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="862"/>
+        <location filename="mainwindow.cc" line="872"/>
         <source>No input file specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="869"/>
+        <location filename="mainwindow.cc" line="879"/>
         <source>No valid output specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="874"/>
+        <location filename="mainwindow.cc" line="884"/>
         <source>No output file specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="890"/>
+        <location filename="mainwindow.cc" line="900"/>
         <source>Process &quot;%1&quot; did not start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="904"/>
+        <location filename="mainwindow.cc" line="914"/>
         <source>Process exited unsucessfully with code %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1047"/>
+        <location filename="mainwindow.cc" line="1057"/>
         <source>Translation successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1057"/>
+        <location filename="mainwindow.cc" line="1067"/>
         <source>Error running gpsbabel: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1170"/>
+        <location filename="mainwindow.cc" line="1180"/>
         <source>Are you sure you want to reset all format options to default values?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1194"/>
+        <location filename="mainwindow.cc" line="1204"/>
         <source>About %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1237"/>
+        <location filename="mainwindow.cc" line="1247"/>
         <source>One or more data filters are active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1239"/>
+        <location filename="mainwindow.cc" line="1249"/>
         <source>No data filters are active</source>
         <translation type="unfinished"></translation>
     </message>
@@ -884,7 +884,8 @@ Some GPS data formats support only some subset of waypoints, tracks, and routes.
 <context>
     <name>OptionsDlg</name>
     <message>
-        <location filename="optionsdlg.cc" line="189"/>
+        <location filename="optionsdlg.cc" line="192"/>
+        <location filename="optionsdlg.cc" line="203"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1400,17 +1401,17 @@ This option computes (or recomputes) a value for the GPS heading at each trackpo
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="upgrade.cc" line="322"/>
+        <location filename="upgrade.cc" line="326"/>
         <source>A new version of GPSBabel is available.&lt;br /&gt;Your version is %1 &lt;br /&gt;The latest version is %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="upgrade.cc" line="333"/>
+        <location filename="upgrade.cc" line="337"/>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="upgrade.cc" line="339"/>
+        <location filename="upgrade.cc" line="343"/>
         <source>Do you wish to download an upgrade?</source>
         <translation type="unfinished"></translation>
     </message>
index b9227b0ccb74408f23ffdc35e931b10be4bfab8c..d22665723402017ce93f504c291ca64adbd0cee1 100644 (file)
@@ -194,12 +194,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FileDlgManager</name>
     <message>
-        <location filename="optionsdlg.cc" line="70"/>
+        <location filename="optionsdlg.cc" line="73"/>
         <source>Select input file</source>
         <translation>Originaldatei wählen</translation>
     </message>
     <message>
-        <location filename="optionsdlg.cc" line="75"/>
+        <location filename="optionsdlg.cc" line="77"/>
         <source>Select output file</source>
         <translation>Zieldatei wählen</translation>
     </message>
@@ -458,23 +458,23 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.cc" line="386"/>
-        <location filename="mainwindow.cc" line="387"/>
+        <location filename="mainwindow.cc" line="396"/>
+        <location filename="mainwindow.cc" line="397"/>
         <source>default</source>
         <translation>default</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="560"/>
+        <location filename="mainwindow.cc" line="570"/>
         <source>Select one or more input files</source>
         <translation>eine oder mehrere Originaldateien markieren</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="587"/>
+        <location filename="mainwindow.cc" line="597"/>
         <source>Output File Name</source>
         <translation>Zieldatei-Name</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="647"/>
+        <location filename="mainwindow.cc" line="657"/>
         <source>Error reading format configuration.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
@@ -483,7 +483,7 @@ This program cannot continue.</source>
 Das Programm muss abgebrochen werden.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="658"/>
+        <location filename="mainwindow.cc" line="668"/>
         <source>Some file/device formats were not found during initialization.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
@@ -492,114 +492,114 @@ This program cannot continue.</source>
 Das Prgramm muss abgebrochen werden.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="680"/>
+        <location filename="mainwindow.cc" line="690"/>
         <source>Input and output formats do not support %1</source>
         <translation>Keine Unterstützung für %1 im Ein- oder Ausgabeformat</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="683"/>
+        <location filename="mainwindow.cc" line="693"/>
         <source>Input does not support %1; output format supports %2</source>
         <translation>Keine Unterstützung für %1 im Eingabeformat; Ausgabeformat unterstützt %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="686"/>
+        <location filename="mainwindow.cc" line="696"/>
         <source>Input format supports %1; output format does not support %2</source>
         <translation>Eingabeformat  unterstützt %1. Keine Unterstützung für %2 im Ausgabeformat</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="689"/>
+        <location filename="mainwindow.cc" line="699"/>
         <source>Both input and output formats support %1</source>
         <translation>Ein- und Ausgabeformat unterstützen %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="710"/>
+        <location filename="mainwindow.cc" line="720"/>
         <source>waypoints</source>
         <translation>Wegpunkte</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="711"/>
+        <location filename="mainwindow.cc" line="721"/>
         <source>tracks</source>
         <translation>tracks</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="712"/>
+        <location filename="mainwindow.cc" line="722"/>
         <source>routes</source>
         <translation>Routen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="802"/>
+        <location filename="mainwindow.cc" line="812"/>
         <source>There are no input options for format &quot;%1&quot;</source>
         <translation>Es gibt keine Eingabeoptionen für das Format &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="809"/>
-        <location filename="mainwindow.cc" line="829"/>
+        <location filename="mainwindow.cc" line="819"/>
+        <location filename="mainwindow.cc" line="839"/>
         <source>Options for %1</source>
         <translation>Optionen für %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="822"/>
+        <location filename="mainwindow.cc" line="832"/>
         <source>There are no output options for format &quot;%1&quot;</source>
         <translation>Es gibt keine Ausgabeoptionen für das Format &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="843"/>
+        <location filename="mainwindow.cc" line="853"/>
         <source>No valid waypoints/routes/tracks translation specified</source>
         <translation>keine gültige Angabe von Wegpunkt-/Routen-/Trackfiltern</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="862"/>
+        <location filename="mainwindow.cc" line="872"/>
         <source>No input file specified</source>
         <translation>keine Quelldatei angegeben</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="869"/>
+        <location filename="mainwindow.cc" line="879"/>
         <source>No valid output specified</source>
         <translation>keine gültiges Ziel angegeben</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="874"/>
+        <location filename="mainwindow.cc" line="884"/>
         <source>No output file specified</source>
         <translation>keine Zieldatei angegeben</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="890"/>
+        <location filename="mainwindow.cc" line="900"/>
         <source>Process &quot;%1&quot; did not start</source>
         <translation>Prozess &quot;%1&quot; wurde nicht gestartet</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="904"/>
+        <location filename="mainwindow.cc" line="914"/>
         <source>Process exited unsucessfully with code %1</source>
         <translation>Prozess endete mit code %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1047"/>
+        <location filename="mainwindow.cc" line="1057"/>
         <source>Translation successful</source>
         <translation>Konvertierung erfolgreich</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1057"/>
+        <location filename="mainwindow.cc" line="1067"/>
         <source>Error running gpsbabel: %1
 </source>
         <translation>Fehler beim Aufruf von gpsbabel: %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1170"/>
+        <location filename="mainwindow.cc" line="1180"/>
         <source>Are you sure you want to reset all format options to default values?</source>
         <translation>Sind Sie sicher, dass Sie alle Formatoptionen auf die Vorgaben stellen wollen?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1194"/>
+        <location filename="mainwindow.cc" line="1204"/>
         <source>About %1</source>
         <translation>Über %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1237"/>
+        <location filename="mainwindow.cc" line="1247"/>
         <source>One or more data filters are active</source>
         <translation>Einer oder mehrere Datenfilter sind aktiviert</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1239"/>
+        <location filename="mainwindow.cc" line="1249"/>
         <source>No data filters are active</source>
         <translation>Keine Datenfilter sind aktiv</translation>
     </message>
@@ -624,8 +624,8 @@ Das Prgramm muss abgebrochen werden.</translation>
     </message>
     <message>
         <location filename="mainwinui.ui" line="44"/>
-        <location filename="mainwinui.ui" line="428"/>
-        <location filename="mainwinui.ui" line="632"/>
+        <location filename="mainwinui.ui" line="438"/>
+        <location filename="mainwinui.ui" line="642"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
@@ -636,13 +636,13 @@ Das Prgramm muss abgebrochen werden.</translation>
     </message>
     <message>
         <location filename="mainwinui.ui" line="60"/>
-        <location filename="mainwinui.ui" line="444"/>
+        <location filename="mainwinui.ui" line="454"/>
         <source>Device</source>
         <translation>Gerät</translation>
     </message>
     <message>
         <location filename="mainwinui.ui" line="89"/>
-        <location filename="mainwinui.ui" line="473"/>
+        <location filename="mainwinui.ui" line="483"/>
         <source>Format</source>
         <translation>Format</translation>
     </message>
@@ -670,7 +670,7 @@ Das Prgramm muss abgebrochen werden.</translation>
     </message>
     <message>
         <location filename="mainwinui.ui" line="162"/>
-        <location filename="mainwinui.ui" line="543"/>
+        <location filename="mainwinui.ui" line="553"/>
         <source>Device Name:</source>
         <translation>Gerätename:</translation>
     </message>
@@ -687,169 +687,169 @@ Das Prgramm muss abgebrochen werden.</translation>
     </message>
     <message>
         <location filename="mainwinui.ui" line="203"/>
-        <location filename="mainwinui.ui" line="584"/>
+        <location filename="mainwinui.ui" line="594"/>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="218"/>
+        <location filename="mainwinui.ui" line="228"/>
         <source>Translation Options</source>
         <translation>Übersetzungsoptionen</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="227"/>
-        <location filename="mainwinui.ui" line="270"/>
-        <location filename="mainwinui.ui" line="310"/>
+        <location filename="mainwinui.ui" line="237"/>
+        <location filename="mainwinui.ui" line="280"/>
+        <location filename="mainwinui.ui" line="320"/>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="237"/>
+        <location filename="mainwinui.ui" line="247"/>
         <source>If selected, translate waypoints.</source>
         <translatorcomment>no sentence</translatorcomment>
         <translation>bei Auswahl: übersetzen von Wegpunkten</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="240"/>
+        <location filename="mainwinui.ui" line="250"/>
         <source>Waypoints</source>
         <translation>Wegpunkte</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="277"/>
+        <location filename="mainwinui.ui" line="287"/>
         <source>If selected, translate routes.</source>
         <translatorcomment>no sentence</translatorcomment>
         <translation>bei Auswahl: übersetzen von Routen</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="280"/>
+        <location filename="mainwinui.ui" line="290"/>
         <source>Routes</source>
         <translation>Routen</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="317"/>
+        <location filename="mainwinui.ui" line="327"/>
         <source>If selected, translate tracks.</source>
         <translatorcomment>no sentence</translatorcomment>
         <translation>bei Auswahl: übersetzen von Tracks</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="320"/>
+        <location filename="mainwinui.ui" line="330"/>
         <source>Tracks</source>
         <translation>Tracks</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="356"/>
+        <location filename="mainwinui.ui" line="366"/>
         <source>Data Filters between input and output</source>
         <translation>Datenfilter zwischen Ein- und Ausgabe</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="359"/>
+        <location filename="mainwinui.ui" line="369"/>
         <source>Filters</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="392"/>
+        <location filename="mainwinui.ui" line="402"/>
         <source>More translation options. </source>
         <translatorcomment>no sentence</translatorcomment>
         <translation>weitere Übersetzungsoptionen</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="395"/>
+        <location filename="mainwinui.ui" line="405"/>
         <source>More Options</source>
         <translation>weitere Optionen</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="405"/>
+        <location filename="mainwinui.ui" line="415"/>
         <source>Output</source>
         <translation>Ausgabe</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="425"/>
+        <location filename="mainwinui.ui" line="435"/>
         <source>If selected, output is to a file. </source>
         <translation>Wenn markiert, geht die Ausgabe in eine Datei.</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="441"/>
+        <location filename="mainwinui.ui" line="451"/>
         <source>If selected, output is to a device or GPS unit</source>
         <translation>Wenn markiert, geht die Ausgabe in eine Gerät oder eine GPS-Einheit</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="480"/>
+        <location filename="mainwinui.ui" line="490"/>
         <source>Output data format.</source>
         <translatorcomment>no sentence</translatorcomment>
         <translation>Ausgabeformat</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="487"/>
+        <location filename="mainwinui.ui" line="497"/>
         <source>Character encoding of output</source>
         <translatorcomment>alt.: Codepage der Ausgabe</translatorcomment>
         <translation>Zeichenkodierung der Ausgabe</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="508"/>
+        <location filename="mainwinui.ui" line="518"/>
         <source>Browse for an output file name. </source>
         <translatorcomment>no sentence</translatorcomment>
         <translation>Suchen nach Zieldatei-Namen</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="511"/>
+        <location filename="mainwinui.ui" line="521"/>
         <source>File Name</source>
         <translation>Dateiname</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="550"/>
+        <location filename="mainwinui.ui" line="560"/>
         <source>Name of port to which output device is connected</source>
         <translation>Name der Schnittstelle, an die das Ausgabegerät angeschlossen ist</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="581"/>
+        <location filename="mainwinui.ui" line="591"/>
         <source>Options for the selected output format. </source>
         <translatorcomment>no sentence</translatorcomment>
         <translation>Optionen für das gewählte Ausgabeformat</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="605"/>
+        <location filename="mainwinui.ui" line="615"/>
         <source>Output of GPSBabel translation process. </source>
         <translatorcomment>no sentence</translatorcomment>
         <translation>Ausgabe des GPSBabel Übersetzungsprozesses</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="639"/>
+        <location filename="mainwinui.ui" line="649"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="655"/>
+        <location filename="mainwinui.ui" line="665"/>
         <source>GPSBabel Help</source>
         <translation>GPSBabel Hilfe</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="660"/>
+        <location filename="mainwinui.ui" line="670"/>
         <source>About GPSBabel</source>
         <translation>Über GPSBabel</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="665"/>
+        <location filename="mainwinui.ui" line="675"/>
         <source>Quit</source>
         <translation>Beenden</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="670"/>
+        <location filename="mainwinui.ui" line="680"/>
         <source>Preferences...</source>
         <translatorcomment>Via Google Translate</translatorcomment>
         <translation>Einstellungen ...</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="675"/>
+        <location filename="mainwinui.ui" line="685"/>
         <source>Check for Upgrade</source>
         <translation>Nach Upgrade suchen</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="680"/>
+        <location filename="mainwinui.ui" line="690"/>
         <source>Visit Website...</source>
         <translation>Webseite besuchen ...</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="685"/>
+        <location filename="mainwinui.ui" line="695"/>
         <source>Make a Donation...</source>
         <translation>Spenden Sie...</translation>
     </message>
@@ -969,7 +969,8 @@ Manche Dateiformate unterstuetzen nur eine Teilmenge, entweder Wegpunkte oder Tr
 <context>
     <name>OptionsDlg</name>
     <message>
-        <location filename="optionsdlg.cc" line="189"/>
+        <location filename="optionsdlg.cc" line="192"/>
+        <location filename="optionsdlg.cc" line="203"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
@@ -1564,12 +1565,12 @@ Diese Option generiert für jeden Trackpunkt einen Geschwindigkeitswert. Sie wir
         <translation></translation>
     </message>
     <message>
-        <location filename="upgrade.cc" line="322"/>
+        <location filename="upgrade.cc" line="326"/>
         <source>A new version of GPSBabel is available.&lt;br /&gt;Your version is %1 &lt;br /&gt;The latest version is %2</source>
         <translation>Eine neue Version von GPSBabel ist verfügbar.&lt;br /&gt;Die installierte Version ist %1 &lt;br /&gt;Die neueste Version ist %2</translation>
     </message>
     <message>
-        <location filename="upgrade.cc" line="339"/>
+        <location filename="upgrade.cc" line="343"/>
         <source>Do you wish to download an upgrade?</source>
         <translation>Möchten Sie die Aktualisierung herunter laden?</translation>
     </message>
@@ -1578,7 +1579,7 @@ Diese Option generiert für jeden Trackpunkt einen Geschwindigkeitswert. Sie wir
         <translation type="obsolete">&lt;center&gt;&lt;b&gt;Eine neue GPSBabel-Version ist verf&amp;uumlgbar&lt;/b&gt;&lt;br&gt;Die Version auf diesem Computer ist %1 &lt;br&gt;Die neueste Version ist %2&lt;/center&gt;</translation>
     </message>
     <message>
-        <location filename="upgrade.cc" line="333"/>
+        <location filename="upgrade.cc" line="337"/>
         <source>Upgrade</source>
         <translation>Update</translation>
     </message>
index 4e10301a167a2e5ee7417c3ac4cc76c8128aba10..f934ca03994e37d7ee1c0225b6b9dfcfac312bc8 100644 (file)
@@ -240,12 +240,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FileDlgManager</name>
     <message>
-        <location filename="optionsdlg.cc" line="70"/>
+        <location filename="optionsdlg.cc" line="73"/>
         <source>Select input file</source>
         <translation>Seleccionar archivo de entrada</translation>
     </message>
     <message>
-        <location filename="optionsdlg.cc" line="75"/>
+        <location filename="optionsdlg.cc" line="77"/>
         <source>Select output file</source>
         <translation>Seleccionar archivo de salida</translation>
     </message>
@@ -505,144 +505,144 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.cc" line="386"/>
-        <location filename="mainwindow.cc" line="387"/>
+        <location filename="mainwindow.cc" line="396"/>
+        <location filename="mainwindow.cc" line="397"/>
         <source>default</source>
         <translation>Defecto</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="560"/>
+        <location filename="mainwindow.cc" line="570"/>
         <source>Select one or more input files</source>
         <translation>Seleccionar uno o más archivos de entrada</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="587"/>
+        <location filename="mainwindow.cc" line="597"/>
         <source>Output File Name</source>
         <translation>Nombre del fichero de salida</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="647"/>
+        <location filename="mainwindow.cc" line="657"/>
         <source>Error reading format configuration.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
         <translation>Se ha producido un error cuando se intentaba leer la configuración. Compruebe que el núcleo de &quot;gpsbabel&quot; está instalado correctamente y que se halla en la RUTA actual. Este programa no puede continuar.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="658"/>
+        <location filename="mainwindow.cc" line="668"/>
         <source>Some file/device formats were not found during initialization.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
         <translation>El formato de alfunos ficheros o dispositivos no se halló durante la inicialización. Compruebe que el núcleo de &quot;gpsbabel&quot; está instalado correctamente y que se halla en la RUTA actual. Este programa no puede continuar.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="680"/>
+        <location filename="mainwindow.cc" line="690"/>
         <source>Input and output formats do not support %1</source>
         <translation>Formatos de entrada y salida inadmisibles %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="683"/>
+        <location filename="mainwindow.cc" line="693"/>
         <source>Input does not support %1; output format supports %2</source>
         <translation>Formatos de entrada inadmisible %1; Formatos de salida inadmisible %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="686"/>
+        <location filename="mainwindow.cc" line="696"/>
         <source>Input format supports %1; output format does not support %2</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="689"/>
+        <location filename="mainwindow.cc" line="699"/>
         <source>Both input and output formats support %1</source>
         <translation>Formatos de entrada y salida admisibles (ambos) %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="710"/>
+        <location filename="mainwindow.cc" line="720"/>
         <source>waypoints</source>
         <translation>Puntos de interés</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="711"/>
+        <location filename="mainwindow.cc" line="721"/>
         <source>tracks</source>
         <translation>Registro de trazados</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="712"/>
+        <location filename="mainwindow.cc" line="722"/>
         <source>routes</source>
         <translation>Rutas</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="802"/>
+        <location filename="mainwindow.cc" line="812"/>
         <source>There are no input options for format &quot;%1&quot;</source>
         <translation>No hay opciones de entrada para el formato &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="809"/>
-        <location filename="mainwindow.cc" line="829"/>
+        <location filename="mainwindow.cc" line="819"/>
+        <location filename="mainwindow.cc" line="839"/>
         <source>Options for %1</source>
         <translation>Opciones de %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="822"/>
+        <location filename="mainwindow.cc" line="832"/>
         <source>There are no output options for format &quot;%1&quot;</source>
         <translation>No hay opciones de salida para el formato &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="843"/>
+        <location filename="mainwindow.cc" line="853"/>
         <source>No valid waypoints/routes/tracks translation specified</source>
         <translation>Se han especificicado puntos de interés, trazados o rutas no traducibles</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="862"/>
+        <location filename="mainwindow.cc" line="872"/>
         <source>No input file specified</source>
         <translation>No se ha especificado el fichero de entrada</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="869"/>
+        <location filename="mainwindow.cc" line="879"/>
         <source>No valid output specified</source>
         <translation>El fichero de salida no es válido</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="874"/>
+        <location filename="mainwindow.cc" line="884"/>
         <source>No output file specified</source>
         <translation>No se ha especificado el fichero de salida</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="890"/>
+        <location filename="mainwindow.cc" line="900"/>
         <source>Process &quot;%1&quot; did not start</source>
         <translation>El proceso &quot;%1&quot; no comenzó</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="904"/>
+        <location filename="mainwindow.cc" line="914"/>
         <source>Process exited unsucessfully with code %1</source>
         <translation>El proceso terminó sin suerte y con el código %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1047"/>
+        <location filename="mainwindow.cc" line="1057"/>
         <source>Translation successful</source>
         <translation>Traducción realizada con éxito</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1057"/>
+        <location filename="mainwindow.cc" line="1067"/>
         <source>Error running gpsbabel: %1
 </source>
         <translation>Error ejecutando gpsbabel: %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1170"/>
+        <location filename="mainwindow.cc" line="1180"/>
         <source>Are you sure you want to reset all format options to default values?</source>
         <translation>¿Estás seguro de que quieres volver a los formatos por defecto?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1194"/>
+        <location filename="mainwindow.cc" line="1204"/>
         <source>About %1</source>
         <translation>Acerca de %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1237"/>
+        <location filename="mainwindow.cc" line="1247"/>
         <source>One or more data filters are active</source>
         <translation>Uno o más filtros de datos están activos</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1239"/>
+        <location filename="mainwindow.cc" line="1249"/>
         <source>No data filters are active</source>
         <translation>Ningún filtro de datos está activo</translation>
     </message>
@@ -667,8 +667,8 @@ This program cannot continue.</source>
     </message>
     <message>
         <location filename="mainwinui.ui" line="44"/>
-        <location filename="mainwinui.ui" line="428"/>
-        <location filename="mainwinui.ui" line="632"/>
+        <location filename="mainwinui.ui" line="438"/>
+        <location filename="mainwinui.ui" line="642"/>
         <source>File</source>
         <translation>Archivo</translation>
     </message>
@@ -679,13 +679,13 @@ This program cannot continue.</source>
     </message>
     <message>
         <location filename="mainwinui.ui" line="60"/>
-        <location filename="mainwinui.ui" line="444"/>
+        <location filename="mainwinui.ui" line="454"/>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
     <message>
         <location filename="mainwinui.ui" line="89"/>
-        <location filename="mainwinui.ui" line="473"/>
+        <location filename="mainwinui.ui" line="483"/>
         <source>Format</source>
         <translation>Formato</translation>
     </message>
@@ -712,7 +712,7 @@ This program cannot continue.</source>
     </message>
     <message>
         <location filename="mainwinui.ui" line="162"/>
-        <location filename="mainwinui.ui" line="543"/>
+        <location filename="mainwinui.ui" line="553"/>
         <source>Device Name:</source>
         <translation>Nombre del dispositivo:</translation>
     </message>
@@ -728,159 +728,159 @@ This program cannot continue.</source>
     </message>
     <message>
         <location filename="mainwinui.ui" line="203"/>
-        <location filename="mainwinui.ui" line="584"/>
+        <location filename="mainwinui.ui" line="594"/>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="218"/>
+        <location filename="mainwinui.ui" line="228"/>
         <source>Translation Options</source>
         <translation>Opciones de conversión</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="227"/>
-        <location filename="mainwinui.ui" line="270"/>
-        <location filename="mainwinui.ui" line="310"/>
+        <location filename="mainwinui.ui" line="237"/>
+        <location filename="mainwinui.ui" line="280"/>
+        <location filename="mainwinui.ui" line="320"/>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="237"/>
+        <location filename="mainwinui.ui" line="247"/>
         <source>If selected, translate waypoints.</source>
         <translation>Si se selecciona, convertir puntos de interés.</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="240"/>
+        <location filename="mainwinui.ui" line="250"/>
         <source>Waypoints</source>
         <translation>Puntos de interés</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="277"/>
+        <location filename="mainwinui.ui" line="287"/>
         <source>If selected, translate routes.</source>
         <translation>Si se selecciona, convertir las rutas.</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="280"/>
+        <location filename="mainwinui.ui" line="290"/>
         <source>Routes</source>
         <translation>Rutas</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="317"/>
+        <location filename="mainwinui.ui" line="327"/>
         <source>If selected, translate tracks.</source>
         <translation>Si se selecciona, convertir los trazados.</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="320"/>
+        <location filename="mainwinui.ui" line="330"/>
         <source>Tracks</source>
         <translation>Trazados</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="356"/>
+        <location filename="mainwinui.ui" line="366"/>
         <source>Data Filters between input and output</source>
         <translation>Filtros de datos entre la entrada y la salida</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="359"/>
+        <location filename="mainwinui.ui" line="369"/>
         <source>Filters</source>
         <translation>Filtros</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="392"/>
+        <location filename="mainwinui.ui" line="402"/>
         <source>More translation options. </source>
         <translation>Más opciones de conversión.</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="395"/>
+        <location filename="mainwinui.ui" line="405"/>
         <source>More Options</source>
         <translation>Más opciones</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="405"/>
+        <location filename="mainwinui.ui" line="415"/>
         <source>Output</source>
         <translation>Salida</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="425"/>
+        <location filename="mainwinui.ui" line="435"/>
         <source>If selected, output is to a file. </source>
         <translation>Si se selecciona, la salida es a un fichero. </translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="441"/>
+        <location filename="mainwinui.ui" line="451"/>
         <source>If selected, output is to a device or GPS unit</source>
         <translation>Si se selecciona, la salida esperada es un dispositivo o un GPS</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="480"/>
+        <location filename="mainwinui.ui" line="490"/>
         <source>Output data format.</source>
         <translation>Formato de salida de los datos.</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="487"/>
+        <location filename="mainwinui.ui" line="497"/>
         <source>Character encoding of output</source>
         <translation>Codificación de los caracteres de salida</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="508"/>
+        <location filename="mainwinui.ui" line="518"/>
         <source>Browse for an output file name. </source>
         <translation>Selecciona el nombre del fichero de salida. </translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="511"/>
+        <location filename="mainwinui.ui" line="521"/>
         <source>File Name</source>
         <translation>Nombre del fichero</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="550"/>
+        <location filename="mainwinui.ui" line="560"/>
         <source>Name of port to which output device is connected</source>
         <translation>Nombre del puerto al que está conectado el dispositivo de salida</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="581"/>
+        <location filename="mainwinui.ui" line="591"/>
         <source>Options for the selected output format. </source>
         <translation>Opciones aplicables al formato de salida seleccionado.</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="605"/>
+        <location filename="mainwinui.ui" line="615"/>
         <source>Output of GPSBabel translation process. </source>
         <translation>Salida del proceso de conversión de GPSBabel.</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="639"/>
+        <location filename="mainwinui.ui" line="649"/>
         <source>Help</source>
         <translation>Ayuda</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="655"/>
+        <location filename="mainwinui.ui" line="665"/>
         <source>GPSBabel Help</source>
         <translation>Ayuda de GPSBabel</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="660"/>
+        <location filename="mainwinui.ui" line="670"/>
         <source>About GPSBabel</source>
         <translation>Acerca de GPSBabel</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="665"/>
+        <location filename="mainwinui.ui" line="675"/>
         <source>Quit</source>
         <translation>Salir</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="670"/>
+        <location filename="mainwinui.ui" line="680"/>
         <source>Preferences...</source>
         <translation>Preferencias ...</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="675"/>
+        <location filename="mainwinui.ui" line="685"/>
         <source>Check for Upgrade</source>
         <translation>Comprueba si hay una actualización</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="680"/>
+        <location filename="mainwinui.ui" line="690"/>
         <source>Visit Website...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="685"/>
+        <location filename="mainwinui.ui" line="695"/>
         <source>Make a Donation...</source>
         <translation>Haga una donación...</translation>
     </message>
@@ -996,7 +996,8 @@ Algunos formatos de datos de los GPS solo permiten utilizar una parte de los pun
 <context>
     <name>OptionsDlg</name>
     <message>
-        <location filename="optionsdlg.cc" line="189"/>
+        <location filename="optionsdlg.cc" line="192"/>
+        <location filename="optionsdlg.cc" line="203"/>
         <source>Help</source>
         <translation>Ayuda</translation>
     </message>
@@ -1572,12 +1573,12 @@ Esta opción calcula (o recalcula) un valor para la velocidad de cada punto del
         <translation>Ha devuelto datos no válidos en la línea %1: %2.</translation>
     </message>
     <message>
-        <location filename="upgrade.cc" line="322"/>
+        <location filename="upgrade.cc" line="326"/>
         <source>A new version of GPSBabel is available.&lt;br /&gt;Your version is %1 &lt;br /&gt;The latest version is %2</source>
         <translation>Una nueva versióon de GPSBabel ha salido ya. &lt;br /&gt;Tu versión es la %1 &lt;br /&gt;La última versióon sería %2</translation>
     </message>
     <message>
-        <location filename="upgrade.cc" line="339"/>
+        <location filename="upgrade.cc" line="343"/>
         <source>Do you wish to download an upgrade?</source>
         <translation>¿Quieres bajarte una actualización?</translation>
     </message>
@@ -1586,7 +1587,7 @@ Esta opción calcula (o recalcula) un valor para la velocidad de cada punto del
         <translation type="obsolete">&lt;center&gt;&lt;b&gt;Una nueva versión de GPSBabel está disponible &lt;/b&gt;&lt;br&gt;La versión actual es %1 &lt;br&gt; La versión más reciente es %2&lt;/center&gt;</translation>
     </message>
     <message>
-        <location filename="upgrade.cc" line="333"/>
+        <location filename="upgrade.cc" line="337"/>
         <source>Upgrade</source>
         <translation>Actualizar</translation>
     </message>
index edc7544610544768e6d4e2d2dfdd9bd1fcc7cf14..4239e37ef44baacd89ecb56b5ddef0ce97f7c997 100644 (file)
@@ -181,12 +181,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FileDlgManager</name>
     <message>
-        <location filename="optionsdlg.cc" line="70"/>
+        <location filename="optionsdlg.cc" line="73"/>
         <source>Select input file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="optionsdlg.cc" line="75"/>
+        <location filename="optionsdlg.cc" line="77"/>
         <source>Select output file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -444,144 +444,144 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.cc" line="386"/>
-        <location filename="mainwindow.cc" line="387"/>
+        <location filename="mainwindow.cc" line="396"/>
+        <location filename="mainwindow.cc" line="397"/>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="560"/>
+        <location filename="mainwindow.cc" line="570"/>
         <source>Select one or more input files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="587"/>
+        <location filename="mainwindow.cc" line="597"/>
         <source>Output File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="647"/>
+        <location filename="mainwindow.cc" line="657"/>
         <source>Error reading format configuration.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="658"/>
+        <location filename="mainwindow.cc" line="668"/>
         <source>Some file/device formats were not found during initialization.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="680"/>
+        <location filename="mainwindow.cc" line="690"/>
         <source>Input and output formats do not support %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="683"/>
+        <location filename="mainwindow.cc" line="693"/>
         <source>Input does not support %1; output format supports %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="686"/>
+        <location filename="mainwindow.cc" line="696"/>
         <source>Input format supports %1; output format does not support %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="689"/>
+        <location filename="mainwindow.cc" line="699"/>
         <source>Both input and output formats support %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="710"/>
+        <location filename="mainwindow.cc" line="720"/>
         <source>waypoints</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="711"/>
+        <location filename="mainwindow.cc" line="721"/>
         <source>tracks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="712"/>
+        <location filename="mainwindow.cc" line="722"/>
         <source>routes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="802"/>
+        <location filename="mainwindow.cc" line="812"/>
         <source>There are no input options for format &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="809"/>
-        <location filename="mainwindow.cc" line="829"/>
+        <location filename="mainwindow.cc" line="819"/>
+        <location filename="mainwindow.cc" line="839"/>
         <source>Options for %1</source>
         <translation>Options pour %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="822"/>
+        <location filename="mainwindow.cc" line="832"/>
         <source>There are no output options for format &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="843"/>
+        <location filename="mainwindow.cc" line="853"/>
         <source>No valid waypoints/routes/tracks translation specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="862"/>
+        <location filename="mainwindow.cc" line="872"/>
         <source>No input file specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="869"/>
+        <location filename="mainwindow.cc" line="879"/>
         <source>No valid output specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="874"/>
+        <location filename="mainwindow.cc" line="884"/>
         <source>No output file specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="890"/>
+        <location filename="mainwindow.cc" line="900"/>
         <source>Process &quot;%1&quot; did not start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="904"/>
+        <location filename="mainwindow.cc" line="914"/>
         <source>Process exited unsucessfully with code %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1047"/>
+        <location filename="mainwindow.cc" line="1057"/>
         <source>Translation successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1057"/>
+        <location filename="mainwindow.cc" line="1067"/>
         <source>Error running gpsbabel: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1170"/>
+        <location filename="mainwindow.cc" line="1180"/>
         <source>Are you sure you want to reset all format options to default values?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1194"/>
+        <location filename="mainwindow.cc" line="1204"/>
         <source>About %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1237"/>
+        <location filename="mainwindow.cc" line="1247"/>
         <source>One or more data filters are active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1239"/>
+        <location filename="mainwindow.cc" line="1249"/>
         <source>No data filters are active</source>
         <translation type="unfinished"></translation>
     </message>
@@ -602,8 +602,8 @@ This program cannot continue.</source>
     </message>
     <message>
         <location filename="mainwinui.ui" line="44"/>
-        <location filename="mainwinui.ui" line="428"/>
-        <location filename="mainwinui.ui" line="632"/>
+        <location filename="mainwinui.ui" line="438"/>
+        <location filename="mainwinui.ui" line="642"/>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
@@ -614,13 +614,13 @@ This program cannot continue.</source>
     </message>
     <message>
         <location filename="mainwinui.ui" line="60"/>
-        <location filename="mainwinui.ui" line="444"/>
+        <location filename="mainwinui.ui" line="454"/>
         <source>Device</source>
         <translation>Périphérique</translation>
     </message>
     <message>
         <location filename="mainwinui.ui" line="89"/>
-        <location filename="mainwinui.ui" line="473"/>
+        <location filename="mainwinui.ui" line="483"/>
         <source>Format</source>
         <translation type="unfinished">Format</translation>
     </message>
@@ -646,7 +646,7 @@ This program cannot continue.</source>
     </message>
     <message>
         <location filename="mainwinui.ui" line="162"/>
-        <location filename="mainwinui.ui" line="543"/>
+        <location filename="mainwinui.ui" line="553"/>
         <source>Device Name:</source>
         <translatorcomment>via google translate</translatorcomment>
         <translation>nom du périphérique:</translation>
@@ -664,162 +664,162 @@ This program cannot continue.</source>
     </message>
     <message>
         <location filename="mainwinui.ui" line="203"/>
-        <location filename="mainwinui.ui" line="584"/>
+        <location filename="mainwinui.ui" line="594"/>
         <source>Options</source>
         <translation type="unfinished">Options</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="218"/>
+        <location filename="mainwinui.ui" line="228"/>
         <source>Translation Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="227"/>
-        <location filename="mainwinui.ui" line="270"/>
-        <location filename="mainwinui.ui" line="310"/>
+        <location filename="mainwinui.ui" line="237"/>
+        <location filename="mainwinui.ui" line="280"/>
+        <location filename="mainwinui.ui" line="320"/>
         <source>-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="237"/>
+        <location filename="mainwinui.ui" line="247"/>
         <source>If selected, translate waypoints.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="240"/>
+        <location filename="mainwinui.ui" line="250"/>
         <source>Waypoints</source>
         <translation type="unfinished">Waypoints</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="277"/>
+        <location filename="mainwinui.ui" line="287"/>
         <source>If selected, translate routes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="280"/>
+        <location filename="mainwinui.ui" line="290"/>
         <source>Routes</source>
         <translation type="unfinished">Routes</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="317"/>
+        <location filename="mainwinui.ui" line="327"/>
         <source>If selected, translate tracks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="320"/>
+        <location filename="mainwinui.ui" line="330"/>
         <source>Tracks</source>
         <translation type="unfinished">Traces</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="356"/>
+        <location filename="mainwinui.ui" line="366"/>
         <source>Data Filters between input and output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="359"/>
+        <location filename="mainwinui.ui" line="369"/>
         <source>Filters</source>
         <translatorcomment>via Google Translate</translatorcomment>
         <translation>Filtres</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="392"/>
+        <location filename="mainwinui.ui" line="402"/>
         <source>More translation options. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="395"/>
+        <location filename="mainwinui.ui" line="405"/>
         <source>More Options</source>
         <translatorcomment>via Google Translate</translatorcomment>
         <translation>Plus d&apos;options</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="405"/>
+        <location filename="mainwinui.ui" line="415"/>
         <source>Output</source>
         <translation type="unfinished">Sortie</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="425"/>
+        <location filename="mainwinui.ui" line="435"/>
         <source>If selected, output is to a file. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="441"/>
+        <location filename="mainwinui.ui" line="451"/>
         <source>If selected, output is to a device or GPS unit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="480"/>
+        <location filename="mainwinui.ui" line="490"/>
         <source>Output data format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="487"/>
+        <location filename="mainwinui.ui" line="497"/>
         <source>Character encoding of output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="508"/>
+        <location filename="mainwinui.ui" line="518"/>
         <source>Browse for an output file name. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="511"/>
+        <location filename="mainwinui.ui" line="521"/>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="550"/>
+        <location filename="mainwinui.ui" line="560"/>
         <source>Name of port to which output device is connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="581"/>
+        <location filename="mainwinui.ui" line="591"/>
         <source>Options for the selected output format. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="605"/>
+        <location filename="mainwinui.ui" line="615"/>
         <source>Output of GPSBabel translation process. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="639"/>
+        <location filename="mainwinui.ui" line="649"/>
         <source>Help</source>
         <translation>Aide</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="655"/>
+        <location filename="mainwinui.ui" line="665"/>
         <source>GPSBabel Help</source>
         <translatorcomment>Via Google Translate</translatorcomment>
         <translation>GPSBabel aider</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="660"/>
+        <location filename="mainwinui.ui" line="670"/>
         <source>About GPSBabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="665"/>
+        <location filename="mainwinui.ui" line="675"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="670"/>
+        <location filename="mainwinui.ui" line="680"/>
         <source>Preferences...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="675"/>
+        <location filename="mainwinui.ui" line="685"/>
         <source>Check for Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="680"/>
+        <location filename="mainwinui.ui" line="690"/>
         <source>Visit Website...</source>
         <translation type="unfinished">Visitez le site web ...</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="685"/>
+        <location filename="mainwinui.ui" line="695"/>
         <source>Make a Donation...</source>
         <translation type="unfinished">Faire un don...</translation>
     </message>
@@ -932,7 +932,8 @@ Some GPS data formats support only some subset of waypoints, tracks, and routes.
 <context>
     <name>OptionsDlg</name>
     <message>
-        <location filename="optionsdlg.cc" line="189"/>
+        <location filename="optionsdlg.cc" line="192"/>
+        <location filename="optionsdlg.cc" line="203"/>
         <source>Help</source>
         <translation>Aide</translation>
     </message>
@@ -1449,17 +1450,17 @@ This option computes a value for the GPS speed at each trackpoint. This is most
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="upgrade.cc" line="322"/>
+        <location filename="upgrade.cc" line="326"/>
         <source>A new version of GPSBabel is available.&lt;br /&gt;Your version is %1 &lt;br /&gt;The latest version is %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="upgrade.cc" line="339"/>
+        <location filename="upgrade.cc" line="343"/>
         <source>Do you wish to download an upgrade?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="upgrade.cc" line="333"/>
+        <location filename="upgrade.cc" line="337"/>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
index 0675a5cc05b59a85988f9750f3fc48489fe8c171..0c1e74048ab36264e9239a26ef50c88d0c9a21af 100644 (file)
@@ -181,12 +181,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FileDlgManager</name>
     <message>
-        <location filename="optionsdlg.cc" line="70"/>
+        <location filename="optionsdlg.cc" line="73"/>
         <source>Select input file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="optionsdlg.cc" line="75"/>
+        <location filename="optionsdlg.cc" line="77"/>
         <source>Select output file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -444,144 +444,144 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.cc" line="386"/>
-        <location filename="mainwindow.cc" line="387"/>
+        <location filename="mainwindow.cc" line="396"/>
+        <location filename="mainwindow.cc" line="397"/>
         <source>default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="560"/>
+        <location filename="mainwindow.cc" line="570"/>
         <source>Select one or more input files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="587"/>
+        <location filename="mainwindow.cc" line="597"/>
         <source>Output File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="647"/>
+        <location filename="mainwindow.cc" line="657"/>
         <source>Error reading format configuration.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="658"/>
+        <location filename="mainwindow.cc" line="668"/>
         <source>Some file/device formats were not found during initialization.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="680"/>
+        <location filename="mainwindow.cc" line="690"/>
         <source>Input and output formats do not support %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="683"/>
+        <location filename="mainwindow.cc" line="693"/>
         <source>Input does not support %1; output format supports %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="686"/>
+        <location filename="mainwindow.cc" line="696"/>
         <source>Input format supports %1; output format does not support %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="689"/>
+        <location filename="mainwindow.cc" line="699"/>
         <source>Both input and output formats support %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="710"/>
+        <location filename="mainwindow.cc" line="720"/>
         <source>waypoints</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="711"/>
+        <location filename="mainwindow.cc" line="721"/>
         <source>tracks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="712"/>
+        <location filename="mainwindow.cc" line="722"/>
         <source>routes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="802"/>
+        <location filename="mainwindow.cc" line="812"/>
         <source>There are no input options for format &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="809"/>
-        <location filename="mainwindow.cc" line="829"/>
+        <location filename="mainwindow.cc" line="819"/>
+        <location filename="mainwindow.cc" line="839"/>
         <source>Options for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="822"/>
+        <location filename="mainwindow.cc" line="832"/>
         <source>There are no output options for format &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="843"/>
+        <location filename="mainwindow.cc" line="853"/>
         <source>No valid waypoints/routes/tracks translation specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="862"/>
+        <location filename="mainwindow.cc" line="872"/>
         <source>No input file specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="869"/>
+        <location filename="mainwindow.cc" line="879"/>
         <source>No valid output specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="874"/>
+        <location filename="mainwindow.cc" line="884"/>
         <source>No output file specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="890"/>
+        <location filename="mainwindow.cc" line="900"/>
         <source>Process &quot;%1&quot; did not start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="904"/>
+        <location filename="mainwindow.cc" line="914"/>
         <source>Process exited unsucessfully with code %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1047"/>
+        <location filename="mainwindow.cc" line="1057"/>
         <source>Translation successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1057"/>
+        <location filename="mainwindow.cc" line="1067"/>
         <source>Error running gpsbabel: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1170"/>
+        <location filename="mainwindow.cc" line="1180"/>
         <source>Are you sure you want to reset all format options to default values?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1194"/>
+        <location filename="mainwindow.cc" line="1204"/>
         <source>About %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1237"/>
+        <location filename="mainwindow.cc" line="1247"/>
         <source>One or more data filters are active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1239"/>
+        <location filename="mainwindow.cc" line="1249"/>
         <source>No data filters are active</source>
         <translation type="unfinished"></translation>
     </message>
@@ -602,8 +602,8 @@ This program cannot continue.</source>
     </message>
     <message>
         <location filename="mainwinui.ui" line="44"/>
-        <location filename="mainwinui.ui" line="428"/>
-        <location filename="mainwinui.ui" line="632"/>
+        <location filename="mainwinui.ui" line="438"/>
+        <location filename="mainwinui.ui" line="642"/>
         <source>File</source>
         <translation type="unfinished">Fájl</translation>
     </message>
@@ -614,13 +614,13 @@ This program cannot continue.</source>
     </message>
     <message>
         <location filename="mainwinui.ui" line="60"/>
-        <location filename="mainwinui.ui" line="444"/>
+        <location filename="mainwinui.ui" line="454"/>
         <source>Device</source>
         <translation type="unfinished">Készülék</translation>
     </message>
     <message>
         <location filename="mainwinui.ui" line="89"/>
-        <location filename="mainwinui.ui" line="473"/>
+        <location filename="mainwinui.ui" line="483"/>
         <source>Format</source>
         <translation type="unfinished">Formátum</translation>
     </message>
@@ -646,7 +646,7 @@ This program cannot continue.</source>
     </message>
     <message>
         <location filename="mainwinui.ui" line="162"/>
-        <location filename="mainwinui.ui" line="543"/>
+        <location filename="mainwinui.ui" line="553"/>
         <source>Device Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -662,159 +662,159 @@ This program cannot continue.</source>
     </message>
     <message>
         <location filename="mainwinui.ui" line="203"/>
-        <location filename="mainwinui.ui" line="584"/>
+        <location filename="mainwinui.ui" line="594"/>
         <source>Options</source>
         <translation type="unfinished">Beállítások</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="218"/>
+        <location filename="mainwinui.ui" line="228"/>
         <source>Translation Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="227"/>
-        <location filename="mainwinui.ui" line="270"/>
-        <location filename="mainwinui.ui" line="310"/>
+        <location filename="mainwinui.ui" line="237"/>
+        <location filename="mainwinui.ui" line="280"/>
+        <location filename="mainwinui.ui" line="320"/>
         <source>-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="237"/>
+        <location filename="mainwinui.ui" line="247"/>
         <source>If selected, translate waypoints.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="240"/>
+        <location filename="mainwinui.ui" line="250"/>
         <source>Waypoints</source>
         <translation type="unfinished">Útpontok</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="277"/>
+        <location filename="mainwinui.ui" line="287"/>
         <source>If selected, translate routes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="280"/>
+        <location filename="mainwinui.ui" line="290"/>
         <source>Routes</source>
         <translation type="unfinished">Útvonalak</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="317"/>
+        <location filename="mainwinui.ui" line="327"/>
         <source>If selected, translate tracks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="320"/>
+        <location filename="mainwinui.ui" line="330"/>
         <source>Tracks</source>
         <translation type="unfinished">Nyomvonalak</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="356"/>
+        <location filename="mainwinui.ui" line="366"/>
         <source>Data Filters between input and output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="359"/>
+        <location filename="mainwinui.ui" line="369"/>
         <source>Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="392"/>
+        <location filename="mainwinui.ui" line="402"/>
         <source>More translation options. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="395"/>
+        <location filename="mainwinui.ui" line="405"/>
         <source>More Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="405"/>
+        <location filename="mainwinui.ui" line="415"/>
         <source>Output</source>
         <translation type="unfinished">Kimenet</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="425"/>
+        <location filename="mainwinui.ui" line="435"/>
         <source>If selected, output is to a file. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="441"/>
+        <location filename="mainwinui.ui" line="451"/>
         <source>If selected, output is to a device or GPS unit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="480"/>
+        <location filename="mainwinui.ui" line="490"/>
         <source>Output data format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="487"/>
+        <location filename="mainwinui.ui" line="497"/>
         <source>Character encoding of output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="508"/>
+        <location filename="mainwinui.ui" line="518"/>
         <source>Browse for an output file name. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="511"/>
+        <location filename="mainwinui.ui" line="521"/>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="550"/>
+        <location filename="mainwinui.ui" line="560"/>
         <source>Name of port to which output device is connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="581"/>
+        <location filename="mainwinui.ui" line="591"/>
         <source>Options for the selected output format. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="605"/>
+        <location filename="mainwinui.ui" line="615"/>
         <source>Output of GPSBabel translation process. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="639"/>
+        <location filename="mainwinui.ui" line="649"/>
         <source>Help</source>
         <translation type="unfinished">Segítség</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="655"/>
+        <location filename="mainwinui.ui" line="665"/>
         <source>GPSBabel Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="660"/>
+        <location filename="mainwinui.ui" line="670"/>
         <source>About GPSBabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="665"/>
+        <location filename="mainwinui.ui" line="675"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="670"/>
+        <location filename="mainwinui.ui" line="680"/>
         <source>Preferences...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="675"/>
+        <location filename="mainwinui.ui" line="685"/>
         <source>Check for Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="680"/>
+        <location filename="mainwinui.ui" line="690"/>
         <source>Visit Website...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="685"/>
+        <location filename="mainwinui.ui" line="695"/>
         <source>Make a Donation...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -927,7 +927,8 @@ Some GPS data formats support only some subset of waypoints, tracks, and routes.
 <context>
     <name>OptionsDlg</name>
     <message>
-        <location filename="optionsdlg.cc" line="189"/>
+        <location filename="optionsdlg.cc" line="192"/>
+        <location filename="optionsdlg.cc" line="203"/>
         <source>Help</source>
         <translation type="unfinished">Segítség</translation>
     </message>
@@ -1444,17 +1445,17 @@ This option computes a value for the GPS speed at each trackpoint. This is most
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="upgrade.cc" line="322"/>
+        <location filename="upgrade.cc" line="326"/>
         <source>A new version of GPSBabel is available.&lt;br /&gt;Your version is %1 &lt;br /&gt;The latest version is %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="upgrade.cc" line="339"/>
+        <location filename="upgrade.cc" line="343"/>
         <source>Do you wish to download an upgrade?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="upgrade.cc" line="333"/>
+        <location filename="upgrade.cc" line="337"/>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
index 7ee24834f8508bba8503a07b347920961782f06a..cf0baa7a3a17b351d410d24c1e8a117c931b0400 100644 (file)
@@ -202,12 +202,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FileDlgManager</name>
     <message>
-        <location filename="optionsdlg.cc" line="70"/>
+        <location filename="optionsdlg.cc" line="73"/>
         <source>Select input file</source>
         <translation>Seleziona il file di origine</translation>
     </message>
     <message>
-        <location filename="optionsdlg.cc" line="75"/>
+        <location filename="optionsdlg.cc" line="77"/>
         <source>Select output file</source>
         <translation>Seleziona il file di destinazione</translation>
     </message>
@@ -443,8 +443,8 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="mainwinui.ui" line="44"/>
-        <location filename="mainwinui.ui" line="428"/>
-        <location filename="mainwinui.ui" line="632"/>
+        <location filename="mainwinui.ui" line="438"/>
+        <location filename="mainwinui.ui" line="642"/>
         <source>File</source>
         <translation>File</translation>
     </message>
@@ -455,13 +455,13 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="mainwinui.ui" line="60"/>
-        <location filename="mainwinui.ui" line="444"/>
+        <location filename="mainwinui.ui" line="454"/>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
     <message>
         <location filename="mainwinui.ui" line="89"/>
-        <location filename="mainwinui.ui" line="473"/>
+        <location filename="mainwinui.ui" line="483"/>
         <source>Format</source>
         <translation>Formato</translation>
     </message>
@@ -487,7 +487,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="mainwinui.ui" line="162"/>
-        <location filename="mainwinui.ui" line="543"/>
+        <location filename="mainwinui.ui" line="553"/>
         <source>Device Name:</source>
         <translation>Nome del dispositivo:</translation>
     </message>
@@ -503,180 +503,180 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="mainwinui.ui" line="203"/>
-        <location filename="mainwinui.ui" line="584"/>
+        <location filename="mainwinui.ui" line="594"/>
         <source>Options</source>
         <translation>Opzioni</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="218"/>
+        <location filename="mainwinui.ui" line="228"/>
         <source>Translation Options</source>
         <translation>Opzioni di traduzione</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="227"/>
-        <location filename="mainwinui.ui" line="270"/>
-        <location filename="mainwinui.ui" line="310"/>
+        <location filename="mainwinui.ui" line="237"/>
+        <location filename="mainwinui.ui" line="280"/>
+        <location filename="mainwinui.ui" line="320"/>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="237"/>
+        <location filename="mainwinui.ui" line="247"/>
         <source>If selected, translate waypoints.</source>
         <translation>Se selezionato, traduce i punti di interesse.</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="240"/>
+        <location filename="mainwinui.ui" line="250"/>
         <source>Waypoints</source>
         <translation>Punti di interesse</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="277"/>
+        <location filename="mainwinui.ui" line="287"/>
         <source>If selected, translate routes.</source>
         <translation>Se selezionato, traduce le rotte.</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="280"/>
+        <location filename="mainwinui.ui" line="290"/>
         <source>Routes</source>
         <translation>Rotte</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="317"/>
+        <location filename="mainwinui.ui" line="327"/>
         <source>If selected, translate tracks.</source>
         <translation>Se selezionato, traduce le tracce.</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="320"/>
+        <location filename="mainwinui.ui" line="330"/>
         <source>Tracks</source>
         <translation>Tracce</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="356"/>
+        <location filename="mainwinui.ui" line="366"/>
         <source>Data Filters between input and output</source>
         <translation>Filtri di dati tra sorgente e destinazione</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="359"/>
+        <location filename="mainwinui.ui" line="369"/>
         <source>Filters</source>
         <translation>Filtri</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="392"/>
+        <location filename="mainwinui.ui" line="402"/>
         <source>More translation options. </source>
         <translation>Altre opzioni di traduzione.</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="395"/>
+        <location filename="mainwinui.ui" line="405"/>
         <source>More Options</source>
         <translation>Altre opzioni</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="405"/>
+        <location filename="mainwinui.ui" line="415"/>
         <source>Output</source>
         <translation>Destinazione</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="425"/>
+        <location filename="mainwinui.ui" line="435"/>
         <source>If selected, output is to a file. </source>
         <translation>Se selezionato, la destinazione è un file.</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="441"/>
+        <location filename="mainwinui.ui" line="451"/>
         <source>If selected, output is to a device or GPS unit</source>
         <translation>Se selezionato, la destinazione è un dispositivo o un&apos;unità GPS</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="480"/>
+        <location filename="mainwinui.ui" line="490"/>
         <source>Output data format.</source>
         <translation>Formato dei dati di destinazione.</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="487"/>
+        <location filename="mainwinui.ui" line="497"/>
         <source>Character encoding of output</source>
         <translation>Codifica dei caratteri della destinazione</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="508"/>
+        <location filename="mainwinui.ui" line="518"/>
         <source>Browse for an output file name. </source>
         <translation>Seleziona il nome del file di destinazione.</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="511"/>
+        <location filename="mainwinui.ui" line="521"/>
         <source>File Name</source>
         <translation>Nome del file</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="550"/>
+        <location filename="mainwinui.ui" line="560"/>
         <source>Name of port to which output device is connected</source>
         <translation>Nome della porta cui è connesso il dispositivo di destinazione</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="581"/>
+        <location filename="mainwinui.ui" line="591"/>
         <source>Options for the selected output format. </source>
         <translation>Opzioni per il formato di destinazione selezionato.</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="605"/>
+        <location filename="mainwinui.ui" line="615"/>
         <source>Output of GPSBabel translation process. </source>
         <translation>Risultato del processo di traduzione di GPSBabel.</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="639"/>
+        <location filename="mainwinui.ui" line="649"/>
         <source>Help</source>
         <translation>Aiuto</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="655"/>
+        <location filename="mainwinui.ui" line="665"/>
         <source>GPSBabel Help</source>
         <translation>Aiuto di GPSBabel</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="660"/>
+        <location filename="mainwinui.ui" line="670"/>
         <source>About GPSBabel</source>
         <translation>Informazioni su GPSBabel</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="665"/>
+        <location filename="mainwinui.ui" line="675"/>
         <source>Quit</source>
         <translation>Esci</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="670"/>
+        <location filename="mainwinui.ui" line="680"/>
         <source>Preferences...</source>
         <translation>Preferenze...</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="675"/>
+        <location filename="mainwinui.ui" line="685"/>
         <source>Check for Upgrade</source>
         <translation>Controlla aggiornamenti</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="680"/>
+        <location filename="mainwinui.ui" line="690"/>
         <source>Visit Website...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="685"/>
+        <location filename="mainwinui.ui" line="695"/>
         <source>Make a Donation...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="386"/>
-        <location filename="mainwindow.cc" line="387"/>
+        <location filename="mainwindow.cc" line="396"/>
+        <location filename="mainwindow.cc" line="397"/>
         <source>default</source>
         <translation>predefinite</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="560"/>
+        <location filename="mainwindow.cc" line="570"/>
         <source>Select one or more input files</source>
         <translation>Selezionare uno o più file in ingresso</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="587"/>
+        <location filename="mainwindow.cc" line="597"/>
         <source>Output File Name</source>
         <translation>Nome del file in uscita</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="647"/>
+        <location filename="mainwindow.cc" line="657"/>
         <source>Error reading format configuration.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
@@ -685,7 +685,7 @@ This program cannot continue.</source>
 Questo programma non può proseguire.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="658"/>
+        <location filename="mainwindow.cc" line="668"/>
         <source>Some file/device formats were not found during initialization.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
@@ -694,115 +694,115 @@ This program cannot continue.</source>
 Questo programma non può proseguire.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="680"/>
+        <location filename="mainwindow.cc" line="690"/>
         <source>Input and output formats do not support %1</source>
         <translation>I formati di ingresso e di uscita non supportano %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="683"/>
+        <location filename="mainwindow.cc" line="693"/>
         <source>Input does not support %1; output format supports %2</source>
         <translation>L&apos;ingresso non supporta %1, il formato di destinazione supporta %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="686"/>
+        <location filename="mainwindow.cc" line="696"/>
         <source>Input format supports %1; output format does not support %2</source>
         <translation>Il formato in ingresso supporta %1, il formato di destinazione non supporta %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="689"/>
+        <location filename="mainwindow.cc" line="699"/>
         <source>Both input and output formats support %1</source>
         <translation>I formati di origine e di destinazione supportano %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="710"/>
+        <location filename="mainwindow.cc" line="720"/>
         <source>waypoints</source>
         <translation>punti di interesse</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="711"/>
+        <location filename="mainwindow.cc" line="721"/>
         <source>tracks</source>
         <translation>tracce</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="712"/>
+        <location filename="mainwindow.cc" line="722"/>
         <source>routes</source>
         <translation>rotte</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="802"/>
+        <location filename="mainwindow.cc" line="812"/>
         <source>There are no input options for format &quot;%1&quot;</source>
         <translation>Non ci sono opzioni in ingresso per il formato &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="809"/>
-        <location filename="mainwindow.cc" line="829"/>
+        <location filename="mainwindow.cc" line="819"/>
+        <location filename="mainwindow.cc" line="839"/>
         <source>Options for %1</source>
         <translation>Opzioni per %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="822"/>
+        <location filename="mainwindow.cc" line="832"/>
         <source>There are no output options for format &quot;%1&quot;</source>
         <translation>Non ci sono opzioni in uscita per il formato &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="843"/>
+        <location filename="mainwindow.cc" line="853"/>
         <source>No valid waypoints/routes/tracks translation specified</source>
         <translation>Non è stato specificato alcun punto di interesse/rotta/traccia</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="862"/>
+        <location filename="mainwindow.cc" line="872"/>
         <source>No input file specified</source>
         <translation>Il file di origine non è stato specificato</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="869"/>
+        <location filename="mainwindow.cc" line="879"/>
         <source>No valid output specified</source>
         <translation>Non è stata specificata una destinazione valida</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="874"/>
+        <location filename="mainwindow.cc" line="884"/>
         <source>No output file specified</source>
         <translation>Il file di destinazione non è stato specificato</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="890"/>
+        <location filename="mainwindow.cc" line="900"/>
         <source>Process &quot;%1&quot; did not start</source>
         <translation>Il processo &quot;%1&quot; non è stato avviato</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="904"/>
+        <location filename="mainwindow.cc" line="914"/>
         <source>Process exited unsucessfully with code %1</source>
         <translation>Il processo è terminato con il codice di errorre %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1047"/>
+        <location filename="mainwindow.cc" line="1057"/>
         <source>Translation successful</source>
         <translation>Traduzione terminata con successo</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1057"/>
+        <location filename="mainwindow.cc" line="1067"/>
         <source>Error running gpsbabel: %1
 </source>
         <translation>Errore durante l&apos;esecuzione di gpsbabel: %1
 </translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1170"/>
+        <location filename="mainwindow.cc" line="1180"/>
         <source>Are you sure you want to reset all format options to default values?</source>
         <translation>Si è certi di voler reimpostare tutte le opzioni dei formati ai valori predefiniti?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1194"/>
+        <location filename="mainwindow.cc" line="1204"/>
         <source>About %1</source>
         <translation>Informazioni su %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1237"/>
+        <location filename="mainwindow.cc" line="1247"/>
         <source>One or more data filters are active</source>
         <translation>È attivo uno o più filtri di dati</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1239"/>
+        <location filename="mainwindow.cc" line="1249"/>
         <source>No data filters are active</source>
         <translation>Nessun filtro di dati è attivo</translation>
     </message>
@@ -917,7 +917,8 @@ Qualche formato di dati del GPS supporta solo un sottoinsieme di punti di intere
 <context>
     <name>OptionsDlg</name>
     <message>
-        <location filename="optionsdlg.cc" line="189"/>
+        <location filename="optionsdlg.cc" line="192"/>
+        <location filename="optionsdlg.cc" line="203"/>
         <source>Help</source>
         <translation>Aiuto</translation>
     </message>
@@ -1462,17 +1463,17 @@ Questa opzione calcola (o ricalcola) un valore per la direzione del GPS in ogni
         <translation>Dati ricevuti non validi alla linea %1: %2.</translation>
     </message>
     <message>
-        <location filename="upgrade.cc" line="322"/>
+        <location filename="upgrade.cc" line="326"/>
         <source>A new version of GPSBabel is available.&lt;br /&gt;Your version is %1 &lt;br /&gt;The latest version is %2</source>
         <translation>È disponibile una nuova versione di GPSBabel.&lt;br /&gt;Versione corrente: %1 &lt;br /&gt;Nuova versione: %2</translation>
     </message>
     <message>
-        <location filename="upgrade.cc" line="333"/>
+        <location filename="upgrade.cc" line="337"/>
         <source>Upgrade</source>
         <translation>Aggiorna</translation>
     </message>
     <message>
-        <location filename="upgrade.cc" line="339"/>
+        <location filename="upgrade.cc" line="343"/>
         <source>Do you wish to download an upgrade?</source>
         <translation>Si desidera scaricare un aggiornamento?</translation>
     </message>
index 03935035c4aaa32153ba092ef6a764303366875e..e31ae73f9a7371e244d51596d823462396973fff 100644 (file)
@@ -200,12 +200,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FileDlgManager</name>
     <message>
-        <location filename="optionsdlg.cc" line="70"/>
+        <location filename="optionsdlg.cc" line="73"/>
         <source>Select input file</source>
         <translation>Выберите входной файл</translation>
     </message>
     <message>
-        <location filename="optionsdlg.cc" line="75"/>
+        <location filename="optionsdlg.cc" line="77"/>
         <source>Select output file</source>
         <translation>Выберите выходной файл</translation>
     </message>
@@ -441,8 +441,8 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="mainwinui.ui" line="44"/>
-        <location filename="mainwinui.ui" line="428"/>
-        <location filename="mainwinui.ui" line="632"/>
+        <location filename="mainwinui.ui" line="438"/>
+        <location filename="mainwinui.ui" line="642"/>
         <source>File</source>
         <translation>Файл</translation>
     </message>
@@ -453,13 +453,13 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="mainwinui.ui" line="60"/>
-        <location filename="mainwinui.ui" line="444"/>
+        <location filename="mainwinui.ui" line="454"/>
         <source>Device</source>
         <translation>Устройство</translation>
     </message>
     <message>
         <location filename="mainwinui.ui" line="89"/>
-        <location filename="mainwinui.ui" line="473"/>
+        <location filename="mainwinui.ui" line="483"/>
         <source>Format</source>
         <translation>Формат</translation>
     </message>
@@ -485,7 +485,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="mainwinui.ui" line="162"/>
-        <location filename="mainwinui.ui" line="543"/>
+        <location filename="mainwinui.ui" line="553"/>
         <source>Device Name:</source>
         <translation>Имя устройства:</translation>
     </message>
@@ -501,180 +501,180 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="mainwinui.ui" line="203"/>
-        <location filename="mainwinui.ui" line="584"/>
+        <location filename="mainwinui.ui" line="594"/>
         <source>Options</source>
         <translation>Параметры</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="218"/>
+        <location filename="mainwinui.ui" line="228"/>
         <source>Translation Options</source>
         <translation>Параметры конвертации</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="227"/>
-        <location filename="mainwinui.ui" line="270"/>
-        <location filename="mainwinui.ui" line="310"/>
+        <location filename="mainwinui.ui" line="237"/>
+        <location filename="mainwinui.ui" line="280"/>
+        <location filename="mainwinui.ui" line="320"/>
         <source>-</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="237"/>
+        <location filename="mainwinui.ui" line="247"/>
         <source>If selected, translate waypoints.</source>
         <translation>Если выбрано, конвертируются маршрутные точки.</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="240"/>
+        <location filename="mainwinui.ui" line="250"/>
         <source>Waypoints</source>
         <translation>Маршрутные точки</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="277"/>
+        <location filename="mainwinui.ui" line="287"/>
         <source>If selected, translate routes.</source>
         <translation>Если выбрано, конвертируются маршруты.</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="280"/>
+        <location filename="mainwinui.ui" line="290"/>
         <source>Routes</source>
         <translation>Маршруты</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="317"/>
+        <location filename="mainwinui.ui" line="327"/>
         <source>If selected, translate tracks.</source>
         <translation>Если выбрано, конвертируются треки.</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="320"/>
+        <location filename="mainwinui.ui" line="330"/>
         <source>Tracks</source>
         <translation>Треки</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="356"/>
+        <location filename="mainwinui.ui" line="366"/>
         <source>Data Filters between input and output</source>
         <translation>Фильтр данных между входом и выходом</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="359"/>
+        <location filename="mainwinui.ui" line="369"/>
         <source>Filters</source>
         <translation>Фильтры</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="392"/>
+        <location filename="mainwinui.ui" line="402"/>
         <source>More translation options. </source>
         <translation>Дополнительные параметры конвертации.</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="395"/>
+        <location filename="mainwinui.ui" line="405"/>
         <source>More Options</source>
         <translation>Дополнительно</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="405"/>
+        <location filename="mainwinui.ui" line="415"/>
         <source>Output</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="425"/>
+        <location filename="mainwinui.ui" line="435"/>
         <source>If selected, output is to a file. </source>
         <translation>Если выбрано, результат будет направлен в файл. </translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="441"/>
+        <location filename="mainwinui.ui" line="451"/>
         <source>If selected, output is to a device or GPS unit</source>
         <translation>Если выбрано, результат будет направлен на устройство или GPS приемник</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="480"/>
+        <location filename="mainwinui.ui" line="490"/>
         <source>Output data format.</source>
         <translation>Формат выходных данных.</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="487"/>
+        <location filename="mainwinui.ui" line="497"/>
         <source>Character encoding of output</source>
         <translation>Кодировка выходных данных</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="508"/>
+        <location filename="mainwinui.ui" line="518"/>
         <source>Browse for an output file name. </source>
         <translation>Выберите имя выходного файла.</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="511"/>
+        <location filename="mainwinui.ui" line="521"/>
         <source>File Name</source>
         <translation>Имя файла</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="550"/>
+        <location filename="mainwinui.ui" line="560"/>
         <source>Name of port to which output device is connected</source>
         <translation>Порт к которому подключено выходное устройство</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="581"/>
+        <location filename="mainwinui.ui" line="591"/>
         <source>Options for the selected output format. </source>
         <translation>Параметры выбранного выходного формата.</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="605"/>
+        <location filename="mainwinui.ui" line="615"/>
         <source>Output of GPSBabel translation process. </source>
         <translation>Выполняется конвертация GPSBabel.</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="639"/>
+        <location filename="mainwinui.ui" line="649"/>
         <source>Help</source>
         <translation>Помощь</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="655"/>
+        <location filename="mainwinui.ui" line="665"/>
         <source>GPSBabel Help</source>
         <translation>Справка GPSBabel</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="660"/>
+        <location filename="mainwinui.ui" line="670"/>
         <source>About GPSBabel</source>
         <translation>О GPSBabel</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="665"/>
+        <location filename="mainwinui.ui" line="675"/>
         <source>Quit</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="670"/>
+        <location filename="mainwinui.ui" line="680"/>
         <source>Preferences...</source>
         <translation>Настройки...</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="675"/>
+        <location filename="mainwinui.ui" line="685"/>
         <source>Check for Upgrade</source>
         <translation>Проверить обновления</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="680"/>
+        <location filename="mainwinui.ui" line="690"/>
         <source>Visit Website...</source>
         <translation>Посетите веб-сайт ...</translation>
     </message>
     <message>
-        <location filename="mainwinui.ui" line="685"/>
+        <location filename="mainwinui.ui" line="695"/>
         <source>Make a Donation...</source>
         <translation>Сделать пожертвование...</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="386"/>
-        <location filename="mainwindow.cc" line="387"/>
+        <location filename="mainwindow.cc" line="396"/>
+        <location filename="mainwindow.cc" line="397"/>
         <source>default</source>
         <translation>по умолчанию</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="560"/>
+        <location filename="mainwindow.cc" line="570"/>
         <source>Select one or more input files</source>
         <translation>Выберите один или несколько файлов</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="587"/>
+        <location filename="mainwindow.cc" line="597"/>
         <source>Output File Name</source>
         <translation>Имя выходного файла</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="647"/>
+        <location filename="mainwindow.cc" line="657"/>
         <source>Error reading format configuration.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
@@ -683,7 +683,7 @@ This program cannot continue.</source>
 Выполнение программы не может быть продолжено.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="658"/>
+        <location filename="mainwindow.cc" line="668"/>
         <source>Some file/device formats were not found during initialization.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
@@ -692,114 +692,114 @@ This program cannot continue.</source>
 Выполнение программы не может быть продолжено.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="680"/>
+        <location filename="mainwindow.cc" line="690"/>
         <source>Input and output formats do not support %1</source>
         <translation>Входной и выходной форматы не поддерживают %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="683"/>
+        <location filename="mainwindow.cc" line="693"/>
         <source>Input does not support %1; output format supports %2</source>
         <translation>Входной формат не поддерживает %1; выходной формат поддерживает %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="686"/>
+        <location filename="mainwindow.cc" line="696"/>
         <source>Input format supports %1; output format does not support %2</source>
         <translation>Входной формат поддерживает %1; выходной формат не поддерживаетt %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="689"/>
+        <location filename="mainwindow.cc" line="699"/>
         <source>Both input and output formats support %1</source>
         <translation>Входной и выходной формат поддерживают %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="710"/>
+        <location filename="mainwindow.cc" line="720"/>
         <source>waypoints</source>
         <translation>маршрутные точки</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="711"/>
+        <location filename="mainwindow.cc" line="721"/>
         <source>tracks</source>
         <translation>треки</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="712"/>
+        <location filename="mainwindow.cc" line="722"/>
         <source>routes</source>
         <translation>маршруты</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="802"/>
+        <location filename="mainwindow.cc" line="812"/>
         <source>There are no input options for format &quot;%1&quot;</source>
         <translation>Нет входных параметров для формата &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="809"/>
-        <location filename="mainwindow.cc" line="829"/>
+        <location filename="mainwindow.cc" line="819"/>
+        <location filename="mainwindow.cc" line="839"/>
         <source>Options for %1</source>
         <translation>Параметры %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="822"/>
+        <location filename="mainwindow.cc" line="832"/>
         <source>There are no output options for format &quot;%1&quot;</source>
         <translation>Нет выходных параметров для формата &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="843"/>
+        <location filename="mainwindow.cc" line="853"/>
         <source>No valid waypoints/routes/tracks translation specified</source>
         <translation>Не выбрано преобразование маршрутных точек/маршрутов/треков</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="862"/>
+        <location filename="mainwindow.cc" line="872"/>
         <source>No input file specified</source>
         <translation>Не выбран входной файл</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="869"/>
+        <location filename="mainwindow.cc" line="879"/>
         <source>No valid output specified</source>
         <translation>Не выбран выходной файл</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="874"/>
+        <location filename="mainwindow.cc" line="884"/>
         <source>No output file specified</source>
         <translation>Не выбран выходной файл</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="890"/>
+        <location filename="mainwindow.cc" line="900"/>
         <source>Process &quot;%1&quot; did not start</source>
         <translation>Процесс &quot;%1&quot; не запустился</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="904"/>
+        <location filename="mainwindow.cc" line="914"/>
         <source>Process exited unsucessfully with code %1</source>
         <translation>Процесс завершился неудачей с кодом %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1047"/>
+        <location filename="mainwindow.cc" line="1057"/>
         <source>Translation successful</source>
         <translation>Конвертация выполнена</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1057"/>
+        <location filename="mainwindow.cc" line="1067"/>
         <source>Error running gpsbabel: %1
 </source>
         <translation>Ошибка запуска gpsbabel: %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1170"/>
+        <location filename="mainwindow.cc" line="1180"/>
         <source>Are you sure you want to reset all format options to default values?</source>
         <translation>Вы действительно желаете сбросить все параметры формата в значения по умолчанию?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1194"/>
+        <location filename="mainwindow.cc" line="1204"/>
         <source>About %1</source>
         <translation>О %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1237"/>
+        <location filename="mainwindow.cc" line="1247"/>
         <source>One or more data filters are active</source>
         <translation>Один или более фильтров данных активны</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1239"/>
+        <location filename="mainwindow.cc" line="1249"/>
         <source>No data filters are active</source>
         <translation>Фильтры данных не активны</translation>
     </message>
@@ -914,7 +914,8 @@ Some GPS data formats support only some subset of waypoints, tracks, and routes.
 <context>
     <name>OptionsDlg</name>
     <message>
-        <location filename="optionsdlg.cc" line="189"/>
+        <location filename="optionsdlg.cc" line="192"/>
+        <location filename="optionsdlg.cc" line="203"/>
         <source>Help</source>
         <translation>Помощь</translation>
     </message>
@@ -1459,17 +1460,17 @@ This option computes (or recomputes) a value for the GPS heading at each trackpo
         <translation>Некорректные данные возвращены в строке %1: %2.</translation>
     </message>
     <message>
-        <location filename="upgrade.cc" line="322"/>
+        <location filename="upgrade.cc" line="326"/>
         <source>A new version of GPSBabel is available.&lt;br /&gt;Your version is %1 &lt;br /&gt;The latest version is %2</source>
         <translation>Доступна новая версия GPSBabel.&lt;br /&gt;Используемая версия %1 &lt;br /&gt;Последняя доступная версия %2</translation>
     </message>
     <message>
-        <location filename="upgrade.cc" line="333"/>
+        <location filename="upgrade.cc" line="337"/>
         <source>Upgrade</source>
         <translation>Обновить</translation>
     </message>
     <message>
-        <location filename="upgrade.cc" line="339"/>
+        <location filename="upgrade.cc" line="343"/>
         <source>Do you wish to download an upgrade?</source>
         <translation>Загрузить обновление?</translation>
     </message>
index a8b471402d0a366f06f3783558c5f489544e1a2c..8b48d0a759a79e1373e53ebcc19a2bf570e4fb29 100644 (file)
@@ -104,9 +104,9 @@ static double wgs84_separation(double lat, double lon)
 
 
 static void
-correct_height(const waypoint* wpt)
+correct_height(const Waypoint* wpt)
 {
-  waypoint* waypointp = (waypoint*) wpt;
+  Waypoint* waypointp = (Waypoint*) wpt;
 
   if (addopt) {
     waypointp->altitude += addf;
index f399e9ecade7f6eeb1ac15f6614f49a72fe4650a..b4200bf12cecc7a0ff4143d5f7413cf1060b0e35 100644 (file)
@@ -30,7 +30,7 @@ static gbfile* ofd;
 static QString ostring;
 static gpsbabel::XmlStreamWriter writer(&ostring);
 
-static waypoint* wpt_tmp;
+static Waypoint* wpt_tmp;
 static route_head* trk_head;
 
 #define MYNAME "hiketech"
@@ -144,7 +144,7 @@ hiketech_format_time(const QDateTime& t)
 }
 
 static void
-hiketech_trkpt_pr(const waypoint* waypointp)
+hiketech_trkpt_pr(const Waypoint* waypointp)
 {
   writer.writeStartElement("pnt"); 
   if (waypointp->creation_time.isValid()) {
@@ -160,7 +160,7 @@ hiketech_trkpt_pr(const waypoint* waypointp)
 }
 
 static void
-hiketech_waypt_pr(const waypoint* wpt)
+hiketech_waypt_pr(const Waypoint* wpt)
 {
   writer.writeStartElement("wpt"); 
   writer.setAutoFormattingIndent(-1);
@@ -194,7 +194,7 @@ hiketech_write(void)
 static
 void    ht_wpt_s(xg_string args, const QXmlStreamAttributes* unused)
 {
-  wpt_tmp = new waypoint;
+  wpt_tmp = new Waypoint;
 }
 
 static
@@ -256,7 +256,7 @@ void        ht_trk_ident(xg_string args, const QXmlStreamAttributes* unused)
 static
 void   ht_trk_pnt_s(xg_string args, const QXmlStreamAttributes* unused)
 {
-  wpt_tmp = new waypoint;
+  wpt_tmp = new Waypoint;
 }
 
 static
index 4c9a0c57d967b5ba3e58f0a772a287583d51e3f7..b6838251e63a7b64e861029ff2332003b7fdb1cd 100644 (file)
@@ -81,7 +81,7 @@ static void data_read(void)
   char name[9], desc[90];
   double lat,lon;
   unsigned char* HxWpt;
-  waypoint* wpt_tmp;
+  Waypoint* wpt_tmp;
   int iCount;
   int iDataRead;
   int iWptNum;
@@ -105,7 +105,7 @@ static void data_read(void)
 
   /* Get the waypoints */
   for (iCount = 0; iCount < iWptNum ; iCount ++) {
-    wpt_tmp = new waypoint;
+    wpt_tmp = new Waypoint;
 
     iWptIndex = le_read16(&((WPTHDR*)HxWpt)->idx[iCount]);
     pWptHxTmp = (WPT*)&HxWpt[OFFS_WPT + (sizeof(WPT) * iWptIndex)];
@@ -185,7 +185,7 @@ const char* mknshort(const char* stIn,unsigned int sLen)
 
 
 
-static void holux_disp(const waypoint* wpt)
+static void holux_disp(const Waypoint* wpt)
 {
   double lon,lat;
   short sIndex;
index 46b538b4071894d32b5f1223ed4e8d0bc35389f2..d641af15fbfb7277b5d93b0ef437dc417417bf51 100644 (file)
@@ -78,7 +78,7 @@ wr_deinit(void)
 }
 
 static void
-html_disp(const waypoint* wpt)
+html_disp(const Waypoint* wpt)
 {
   char* cout;
   int32_t utmz;
@@ -248,7 +248,7 @@ html_disp(const waypoint* wpt)
 }
 
 static void
-html_index(const waypoint* wpt)
+html_index(const Waypoint* wpt)
 {
   char* sn = html_entitize(wpt->shortname);
   char* d = html_entitize(wpt->description);
index 77a638eac45fa2de18d952ba4fb8b880cb01fe3d..836899b053e87117ef0ad774642286d798da28e8 100644 (file)
@@ -197,7 +197,7 @@ static int waypoint_num;
 static short_handle wptname_sh, rtename_sh, trkname_sh;
 static humminbird_rte_t* humrte;
 static int rte_num;
-static QMap<QString, waypoint*> map;
+static QMap<QString, Waypoint*> map;
 
 static
 arglist_t humminbird_args[] = {
@@ -269,7 +269,7 @@ humminbird_read_wpt(gbfile* fin)
   humminbird_waypt_t w;
   double guder;
   int num_icons;
-  waypoint* wpt;
+  Waypoint* wpt;
 
   if (! gbfread(&w, 1, sizeof(w), fin)) {
     fatal(MYNAME ": Unexpected end of file!\n");
@@ -285,7 +285,7 @@ humminbird_read_wpt(gbfile* fin)
 
   /* All right! Copy the data to the gpsbabel struct... */
 
-  wpt = new waypoint;
+  wpt = new Waypoint;
 
   // Could probably find a way to eliminate the alloc/copy.
   char *s = xstrndup(w.name, sizeof(w.name));
@@ -351,7 +351,7 @@ humminbird_read_route(gbfile* fin)
     route_head* rte = NULL;
 
     for (i = 0; i < hrte.count; i++) {
-      const waypoint* wpt;
+      const Waypoint* wpt;
       char buff[10];
       hrte.points[i] = be_read16(&hrte.points[i]);
 
@@ -368,7 +368,7 @@ humminbird_read_route(gbfile* fin)
           xfree(s);
           /* rte->rte_num = hrte.num + 1; only internal number */
         }
-        route_add_wpt(rte, new waypoint(*wpt));
+        route_add_wpt(rte, new Waypoint(*wpt));
       }
     }
   }
@@ -381,7 +381,7 @@ humminbird_read_track(gbfile* fin)
   humminbird_trk_header_t th;
   humminbird_trk_point_t* points;
   route_head* trk;
-  waypoint* first_wpt;
+  Waypoint* first_wpt;
   int i;
   int max_points = 0;
   int32_t accum_east;
@@ -434,7 +434,7 @@ humminbird_read_track(gbfile* fin)
 
   /* We create one wpt for the info in the header */
 
-  first_wpt = new waypoint;
+  first_wpt = new Waypoint;
   g_lat = gudermannian_i1924(accum_north);
   first_wpt->latitude  = geocentric_to_geodetic_hwr(g_lat);
   first_wpt->longitude = accum_east/EAST_SCALE * 180.0;
@@ -443,7 +443,7 @@ humminbird_read_track(gbfile* fin)
   track_add_wpt(trk, first_wpt);
 
   for (i=0 ; i<th.num_points-1 ; i++) {
-    waypoint* wpt = new waypoint;
+    Waypoint* wpt = new Waypoint;
     int16_t next_deltaeast, next_deltanorth;
     double guder;
 
@@ -498,7 +498,7 @@ humminbird_read_track_old(gbfile* fin)
   humminbird_trk_header_old_t th;
   humminbird_trk_point_old_t* points;
   route_head* trk;
-  waypoint* first_wpt;
+  Waypoint* first_wpt;
   int i;
   int max_points = 0;
   int32_t accum_east;
@@ -554,7 +554,7 @@ humminbird_read_track_old(gbfile* fin)
 
   /* We create one wpt for the info in the header */
 
-  first_wpt = new waypoint;
+  first_wpt = new Waypoint;
   g_lat = gudermannian_i1924(accum_north);
   first_wpt->latitude  = geocentric_to_geodetic_hwr(g_lat);
   first_wpt->longitude = accum_east/EAST_SCALE * 180.0;
@@ -562,7 +562,7 @@ humminbird_read_track_old(gbfile* fin)
   track_add_wpt(trk, first_wpt);
 
   for (i=0 ; i<th.num_points-1 ; i++) {
-    waypoint* wpt = new waypoint;
+    Waypoint* wpt = new Waypoint;
 //             int16_t next_deltaeast, next_deltanorth;
     double guder;
 
@@ -686,7 +686,7 @@ humminbird_wr_deinit(void)
 }
 
 static void
-humminbird_write_waypoint(const waypoint* wpt)
+humminbird_write_waypoint(const Waypoint* wpt)
 {
   humminbird_waypt_t hum;
   double lat, north, east;
@@ -810,7 +810,7 @@ humminbird_track_tail(const route_head* rte)
 }
 
 static void
-humminbird_track_cb(const waypoint* wpt)
+humminbird_track_cb(const Waypoint* wpt)
 {
   int32_t north, east;
   double lat;
@@ -925,7 +925,7 @@ humminbird_rte_tail(const route_head* rte)
 }
 
 static void
-humminbird_write_rtept(const waypoint* wpt)
+humminbird_write_rtept(const Waypoint* wpt)
 {
   int i;
 
@@ -947,20 +947,20 @@ humminbird_write_rtept(const waypoint* wpt)
 }
 
 static void
-humminbird_write_waypoint_wrapper(const waypoint* wpt)
+humminbird_write_waypoint_wrapper(const Waypoint* wpt)
 {
   char* key;
-  waypoint* tmpwpt;
+  Waypoint* tmpwpt;
 
   xasprintf(&key, "%s\01%.9f\01%.9f", CSTRc(wpt->shortname), wpt->latitude, wpt->longitude);
   if (!(tmpwpt = map[key])) {
-    tmpwpt = (waypoint*)wpt;
-    map[key] = (waypoint*) wpt;
+    tmpwpt = (Waypoint*)wpt;
+    map[key] = (Waypoint*) wpt;
     tmpwpt->extra_data = gb_int2ptr(waypoint_num + 1); /* NOT NULL */
     humminbird_write_waypoint(wpt);
   } else {
     void* p = tmpwpt->extra_data;
-    tmpwpt = (waypoint*)wpt;
+    tmpwpt = (Waypoint*)wpt;
     tmpwpt->extra_data = p;
   }
 
index be6762382464a07cc0010753d7e3b9011d1564c9..23109165b2f8b28885e47bc388ed207ccc81363d 100644 (file)
@@ -156,7 +156,7 @@ static void igc_task_rec(const char* rec)
 
   char task_num[5];
   char task_desc[MAXRECLEN];
-  waypoint* wpt;
+  Waypoint* wpt;
   unsigned int lat_deg, lat_min, lat_frac;
   unsigned int lon_deg, lon_min, lon_frac;
   char lat_hemi[2], lon_hemi[2];
@@ -199,7 +199,7 @@ static void igc_task_rec(const char* rec)
     fatal(MYNAME ": task waypoint (C) record parse error\n%s", rec);
   }
 
-  wpt = new waypoint;
+  wpt = new Waypoint;
   wpt->latitude = ('N' == lat_hemi[0] ? 1 : -1) *
                   (lat_deg + (lat_min * 1000 + lat_frac) / 1000.0 / 60);
 
@@ -267,8 +267,8 @@ static void data_read(void)
   int pres_alt, gnss_alt;
   char pres_valid = 0;
   char gnss_valid = 0;
-  waypoint* pres_wpt = NULL;
-  waypoint* gnss_wpt = NULL;
+  Waypoint* pres_wpt = NULL;
+  Waypoint* gnss_wpt = NULL;
   time_t date = 0;
   time_t prev_tod = 0;
   time_t tod;
@@ -350,7 +350,7 @@ static void data_read(void)
                  &validity, &pres_alt, &gnss_alt) != 14) {
         fatal(MYNAME ": fix (B) record parse error\n%s\n", ibuf);
       }
-      pres_wpt = new waypoint;
+      pres_wpt = new Waypoint;
 
       pres_wpt->latitude = ('N' == lat_hemi[0] ? 1 : -1) *
                            (lat_deg + (lat_min * 1000 + lat_frac) / 1000.0 / 60);
@@ -377,7 +377,7 @@ static void data_read(void)
 
       // Add the same waypoint with GNSS altitude to the second
       // track
-      gnss_wpt = new waypoint(*pres_wpt);
+      gnss_wpt = new Waypoint(*pres_wpt);
 
       if (gnss_alt) {
         gnss_valid = 1;
@@ -540,7 +540,7 @@ static void get_tracks(const route_head** pres_track, const route_head** gnss_tr
  * IGC string formatting functions
  */
 
-static char* latlon2str(const waypoint* wpt)
+static char* latlon2str(const Waypoint* wpt)
 {
   static char str[18] = "";
   char lat_hemi = wpt->latitude < 0 ? 'S' : 'N';
@@ -588,7 +588,7 @@ static void wr_header(void)
   time_t date;
   static const char dflt_str[] = "Unknown";
   const char* str = NULL;
-  waypoint* wpt;
+  Waypoint* wpt;
 
   get_tracks(&pres_track, &track);
   if (!track && pres_track) {
@@ -596,7 +596,7 @@ static void wr_header(void)
   }
   // Date in header record is that of the first fix record
   date = !track ? current_time().toTime_t() :
-         ((waypoint*) QUEUE_FIRST(&track->waypoint_list))->GetCreationTime().toTime_t();
+         ((Waypoint*) QUEUE_FIRST(&track->waypoint_list))->GetCreationTime().toTime_t();
 
   if (NULL == (tm = gmtime(&date))) {
     fatal(MYNAME ": Bad track timestamp\n");
@@ -647,7 +647,7 @@ static void wr_header(void)
  * Generation of IGC task declaration records
  */
 
-static void wr_task_wpt_name(const waypoint* wpt, const char* alt_name)
+static void wr_task_wpt_name(const Waypoint* wpt, const char* alt_name)
 {
   gbfprintf(file_out, "C%s%s\r\n", latlon2str(wpt),
 #if NEW_STRINGS
@@ -660,7 +660,7 @@ static void wr_task_wpt_name(const waypoint* wpt, const char* alt_name)
 static void wr_task_hdr(const route_head* rte)
 {
   unsigned char have_takeoff = 0;
-  const waypoint* wpt;
+  const Waypoint* wpt;
   char flight_date[7] = "000000";
   char task_desc[MAXRECLEN] = "";
   int num_tps = rte->rte_waypt_ct - 2;
@@ -673,7 +673,7 @@ static void wr_task_hdr(const route_head* rte)
   }
   // See if the takeoff and landing waypoints are there or if we need to
   // generate them.
-  wpt = (waypoint*) QUEUE_LAST(&rte->waypoint_list);
+  wpt = (Waypoint*) QUEUE_LAST(&rte->waypoint_list);
 #if NEW_STRINGS
   if (wpt->shortname.startsWith("LANDING")) {
 #else
@@ -681,7 +681,7 @@ static void wr_task_hdr(const route_head* rte)
 #endif
     num_tps--;
   }
-  wpt = (waypoint*) QUEUE_FIRST(&rte->waypoint_list);
+  wpt = (Waypoint*) QUEUE_FIRST(&rte->waypoint_list);
 #if NEW_STRINGS
   if (wpt->shortname.startsWith("TAKEOFF")) {
 #else
@@ -721,7 +721,7 @@ static void wr_task_hdr(const route_head* rte)
   }
 }
 
-static void wr_task_wpt(const waypoint* wpt)
+static void wr_task_wpt(const Waypoint* wpt)
 {
   wr_task_wpt_name(wpt, "");
 }
@@ -729,7 +729,7 @@ static void wr_task_wpt(const waypoint* wpt)
 static void wr_task_tlr(const route_head* rte)
 {
   // If the landing waypoint is not supplied we need to generate it.
-  const waypoint* wpt = (waypoint*) QUEUE_LAST(&rte->waypoint_list);
+  const Waypoint* wpt = (Waypoint*) QUEUE_LAST(&rte->waypoint_list);
   QString sn = wpt->shortname;
 //  if (!wpt->shortname || strncmp(wpt->shortname, "LANDIN", 6) != 0) {
   if (sn.isEmpty() || !sn.startsWith("LANDIN")) {
@@ -745,7 +745,7 @@ static void wr_tasks(void)
 /*
  * Write a single fix record
  */
-static void wr_fix_record(const waypoint* wpt, int pres_alt, int gnss_alt)
+static void wr_fix_record(const Waypoint* wpt, int pres_alt, int gnss_alt)
 {
   struct tm* tm;
 
@@ -781,49 +781,49 @@ static int correlate_tracks(const route_head* pres_track, const route_head* gnss
   double speed;
   time_t pres_time, gnss_time;
   int time_diff;
-  const waypoint* wpt;
+  const Waypoint* wpt;
 
   // Deduce the landing time from the pressure altitude track based on
   // when we last descended to within 10m of the final track altitude.
   elem = QUEUE_LAST(&pres_track->waypoint_list);
-  last_alt = ((waypoint*) elem)->altitude;
+  last_alt = ((Waypoint*) elem)->altitude;
   do {
     elem = elem->prev;
     if (&pres_track->waypoint_list == elem) {
       // No track left
       return 0;
     }
-    alt_diff = last_alt - ((waypoint*) elem)->altitude;
+    alt_diff = last_alt - ((Waypoint*) elem)->altitude;
     if (alt_diff > 10.0) {
       // Last part of track was ascending
       return 0;
     }
   } while (alt_diff > -10.0);
-  pres_time = ((waypoint*) elem->next)->GetCreationTime().toTime_t();
+  pres_time = ((Waypoint*) elem->next)->GetCreationTime().toTime_t();
   if (global_opts.debug_level >= 1) {
     printf(MYNAME ": pressure landing time %s", ctime(&pres_time));
   }
   // Deduce the landing time from the GNSS altitude track based on
   // when the groundspeed last dropped below a certain level.
   elem = QUEUE_LAST(&gnss_track->waypoint_list);
-  last_alt = ((waypoint*) elem)->altitude;
+  last_alt = ((Waypoint*) elem)->altitude;
   do {
-    wpt = (waypoint*) elem;
+    wpt = (Waypoint*) elem;
     elem = elem->prev;
     if (&gnss_track->waypoint_list == elem) {
       // No track left
       return 0;
     }
     // Get a crude indication of groundspeed from the change in lat/lon
-    time_diff = wpt->GetCreationTime().toTime_t() - ((waypoint*) elem)->GetCreationTime().toTime_t();
+    time_diff = wpt->GetCreationTime().toTime_t() - ((Waypoint*) elem)->GetCreationTime().toTime_t();
     speed = !time_diff ? 0 :
-            (fabs(wpt->latitude - ((waypoint*) elem)->latitude) +
-             fabs(wpt->longitude - ((waypoint*) elem)->longitude)) / time_diff;
+            (fabs(wpt->latitude - ((Waypoint*) elem)->latitude) +
+             fabs(wpt->longitude - ((Waypoint*) elem)->longitude)) / time_diff;
     if (global_opts.debug_level >= 2) {
       printf(MYNAME ": speed=%f\n", speed);
     }
   } while (speed < 0.00003);
-  gnss_time = ((waypoint*) elem->next)->GetCreationTime().toTime_t();
+  gnss_time = ((Waypoint*) elem->next)->GetCreationTime().toTime_t();
   if (global_opts.debug_level >= 1) {
     printf(MYNAME ": gnss landing time %s", ctime(&gnss_time));
   }
@@ -844,8 +844,8 @@ static double interpolate_alt(const route_head* track, time_t time)
 {
   static const queue* prev_elem = NULL;
   static const queue* curr_elem = NULL;
-  const waypoint* prev_wpt;
-  const waypoint* curr_wpt;
+  const Waypoint* prev_wpt;
+  const Waypoint* curr_wpt;
   int time_diff;
   double alt_diff;
 
@@ -854,7 +854,7 @@ static double interpolate_alt(const route_head* track, time_t time)
     curr_elem = prev_elem = QUEUE_FIRST(&track->waypoint_list);
   }
   // Find the track points either side of the requested time
-  while (((waypoint*) curr_elem)->GetCreationTime().toTime_t() < time) {
+  while (((Waypoint*) curr_elem)->GetCreationTime().toTime_t() < time) {
     if (QUEUE_LAST(&track->waypoint_list) == curr_elem) {
       // Requested time later than all track points, we can't interpolate
       return unknown_alt;
@@ -863,8 +863,8 @@ static double interpolate_alt(const route_head* track, time_t time)
     curr_elem = QUEUE_NEXT(prev_elem);
   }
 
-  prev_wpt = (waypoint*) prev_elem;
-  curr_wpt = (waypoint*) curr_elem;
+  prev_wpt = (Waypoint*) prev_elem;
+  curr_wpt = (Waypoint*) curr_elem;
 
   if (QUEUE_FIRST(&track->waypoint_list) == curr_elem) {
     if (curr_wpt->GetCreationTime().toTime_t() == time) {
@@ -892,7 +892,7 @@ static void wr_track(void)
 {
   const route_head* pres_track;
   const route_head* gnss_track;
-  const waypoint* wpt;
+  const Waypoint* wpt;
   const queue* elem;
   const queue* tmp;
   int time_adj;
@@ -917,7 +917,7 @@ static void wr_track(void)
     }
     // Iterate through waypoints in both tracks simultaneously
     QUEUE_FOR_EACH(&gnss_track->waypoint_list, elem, tmp) {
-      wpt = (waypoint*) elem;
+      wpt = (Waypoint*) elem;
       pres_alt = interpolate_alt(pres_track, wpt->GetCreationTime().toTime_t() + time_adj);
       wr_fix_record(wpt, (int) pres_alt, (int) wpt->altitude);
     }
@@ -926,13 +926,13 @@ static void wr_track(void)
       // Only the pressure altitude track was found so generate fix
       // records from it alone.
       QUEUE_FOR_EACH(&pres_track->waypoint_list, elem, tmp) {
-        wr_fix_record((waypoint*) elem, (int)((waypoint*) elem)->altitude, (int) unknown_alt);
+        wr_fix_record((Waypoint*) elem, (int)((Waypoint*) elem)->altitude, (int) unknown_alt);
       }
     } else if (gnss_track) {
       // Only the GNSS altitude track was found so generate fix
       // records from it alone.
       QUEUE_FOR_EACH(&gnss_track->waypoint_list, elem, tmp) {
-        wr_fix_record((waypoint*) elem, (int) unknown_alt, (int)((waypoint*) elem)->altitude);
+        wr_fix_record((Waypoint*) elem, (int) unknown_alt, (int)((Waypoint*) elem)->altitude);
       }
     } else {
       // No tracks found so nothing to do
index 49282db5d7dea533e5e951834dc52297be217023..0efd0f3d50ed5e22663c843377f06a63453e3511 100644 (file)
@@ -34,7 +34,7 @@
 static gbfile* fout;
 
 static route_head* track;
-static waypoint* wpt;
+static Waypoint* wpt;
 static int track_index;                /* index of track we'll write */
 static int track_num;          /* current index of track within track_disp_all */
 
@@ -111,7 +111,7 @@ ignr_etape_begin(xg_string args, const QXmlStreamAttributes* attrv)
 {
   ignr_xml_error((wpt != NULL));
 
-  wpt = new waypoint;
+  wpt = new Waypoint;
 }
 
 static void
@@ -211,7 +211,7 @@ ignr_write_track_trl(const route_head* track)
 }
 
 static void
-ignr_write_waypt(const waypoint* wpt)
+ignr_write_waypt(const Waypoint* wpt)
 {
   if (track_num != track_index) {
     return;
index 19a7700b61481a2b707952d60225643826834138..def2a286139518a77fb9eaa57c38c6443aeb7fcf 100644 (file)
@@ -151,7 +151,7 @@ static void igo8_read_init(const char* fname)
 // Reader callback
 static void igo8_read(void)
 {
-  waypoint* wpt_tmp;
+  Waypoint* wpt_tmp;
   route_head* track_head;
   igo8_point point;
 
@@ -161,7 +161,7 @@ static void igo8_read(void)
   while (in_point_count &&
          gbfread(&point, sizeof(point), 1, igo8_file_in) > 0) {
     in_point_count--;
-    wpt_tmp = new waypoint;
+    wpt_tmp = new Waypoint;
 
     wpt_tmp->latitude = le_read32(&point.lat) / (double)0x800000;
     wpt_tmp->longitude = le_read32(&point.lon) / (double)0x800000;
@@ -207,7 +207,7 @@ static void igo8_write_deinit(void)
 }
 
 // Write point callback
-static void write_igo8_track_point(const waypoint* wpt)
+static void write_igo8_track_point(const Waypoint* wpt)
 {
   igo8_point point;
 
index e39e2aa2dfc08869449b198d79100d82e1f80146..7dd19dbe61ca678a6479ffc87ad48ac685193aee 100644 (file)
@@ -34,7 +34,7 @@ static arglist_t ikt_args[] = {
 static QString name, text;
 
 static route_head* track;
-static waypoint* waypt;
+static Waypoint* waypt;
 
 static xg_callback     iktobj_waypt, iktobj_type, iktobj_name, iktobj_trkpt, iktobj_text;
 
@@ -85,7 +85,7 @@ iktobj_waypt(xg_string args, const QXmlStreamAttributes* attrv)
 static void
 iktobj_trkpt(xg_string args, const QXmlStreamAttributes* attrv)
 {
-  waypt = new waypoint;
+  waypt = new Waypoint;
   iktobj_waypt(args, attrv);
   track_add_wpt(track, waypt);
   waypt = NULL;
@@ -113,7 +113,7 @@ iktobj_type(xg_string args, const QXmlStreamAttributes* unused)
   switch (atoi(args)) {
 #endif
   case 0:
-    waypt = new waypoint;
+    waypt = new Waypoint;
     break;
   case 1:
     track = route_head_alloc();
index ad800238dd64bd05b15934ca7503ffd9b65e3147..975c34472286c8f2ed126937aad1ed172c154a29 100644 (file)
@@ -88,7 +88,7 @@ interpfilt_process(void)
     }
     first = 1;
     QUEUE_FOR_EACH(&rte_old->waypoint_list, elem2, tmp2) {
-      waypoint* wpt = (waypoint*)elem2;
+      Waypoint* wpt = (Waypoint*)elem2;
       if (first) {
         first = 0;
       } else {
@@ -97,7 +97,7 @@ interpfilt_process(void)
           for (timen = time1+interval;
                timen < wpt->creation_time.toTime_t();
                timen += interval) {
-            waypoint* wpt_new = new waypoint(*wpt);
+            Waypoint* wpt_new = new Waypoint(*wpt);
             wpt_new->SetCreationTime(timen);
 #if NEW_STRINGS
             wpt_new->shortname = QString();
@@ -134,7 +134,7 @@ interpfilt_process(void)
             for (distn = dist;
                  distn < curdist;
                  distn += dist) {
-              waypoint* wpt_new = new waypoint(*wpt);
+              Waypoint* wpt_new = new Waypoint(*wpt);
               wpt_new->SetCreationTime(distn/curdist*
                                        (wpt->creation_time.toTime_t() - time1) + time1);
 #if NEW_STRINGS
@@ -164,9 +164,9 @@ interpfilt_process(void)
         }
       }
       if (opt_route) {
-        route_add_wpt(rte_new, new waypoint(*wpt));
+        route_add_wpt(rte_new, new Waypoint(*wpt));
       } else {
-        track_add_wpt(rte_new, new waypoint(*wpt));
+        track_add_wpt(rte_new, new Waypoint(*wpt));
       }
 
       lat1 = wpt->latitude;
index 5d5145327281dc52ba275b4026f932284a38cba1..09fe4f831d51c72f7b0a82a184647ade057480ee 100644 (file)
@@ -47,14 +47,14 @@ typedef struct {
 } itracku_data_record;
 
 static int itracku_is_valid_data_record(itracku_data_record* d);
-static void to_itracku_data_record(const waypoint* wp, itracku_data_record* d);
-static waypoint* to_waypoint(itracku_data_record* d);
+static void to_itracku_data_record(const Waypoint* wp, itracku_data_record* d);
+static Waypoint* to_waypoint(itracku_data_record* d);
 
 /* itracku file access */
 static void itracku_file_read_data_record(gbfile* fin, itracku_data_record* d);
 static uint32_t itracku_file_read_last_time(gbfile* fin);
-static void itracku_file_read_waypts(gbfile* fin, void (*waypt_add)(waypoint* wpt));
-static void itracku_file_write_waypt(gbfile* fout, const waypoint* wpt);
+static void itracku_file_read_waypts(gbfile* fin, void (*waypt_add)(Waypoint* wpt));
+static void itracku_file_write_waypt(gbfile* fout, const Waypoint* wpt);
 
 /* itracku device access */
 static const unsigned char read_update_data_command[] = { 0x60, 0xb5, 0, 0, 0, 0, 0 }; /* command string to start memory dump */
@@ -74,7 +74,7 @@ static char* update_data_buffer_read;
 static char* update_data_buffer_write;
 static char* update_data_buffer_end;
 
-static void itracku_device_dump_waypts(void* fd, void (*waypt_add)(waypoint* wpt));
+static void itracku_device_dump_waypts(void* fd, void (*waypt_add)(Waypoint* wpt));
 static int itracku_device_update_data_init();
 static int itracku_device_update_data_read(void* buf, int len);
 static void itracku_device_write_string(const char* s);
@@ -288,11 +288,11 @@ encode_itracku_time(time_t time)
 /*
        Converts a itracku waypoint record to a gpsbabel waypoint.
 */
-static waypoint*
+static Waypoint*
 to_waypoint(itracku_data_record* d)
 {
-  waypoint* wp;
-  wp = new waypoint;
+  Waypoint* wp;
+  wp = new Waypoint;
   wp->longitude = deg_min_to_deg(le_read32(d->longitude));
   wp->latitude = deg_min_to_deg(le_read32(d->latitude));
   wp->SetCreationTime(decode_itracku_time(le_read32(d->creation_time)));
@@ -303,7 +303,7 @@ to_waypoint(itracku_data_record* d)
 }
 
 static void
-to_itracku_data_record(const waypoint* wp, itracku_data_record* d)
+to_itracku_data_record(const Waypoint* wp, itracku_data_record* d)
 {
   le_write32(d->longitude, deg_to_deg_min(wp->longitude));
   le_write32(d->latitude, deg_to_deg_min(wp->latitude));
@@ -509,7 +509,7 @@ itracku_is_valid_data_record(itracku_data_record* d)
 }
 
 static void
-itracku_device_dump_waypts(void* fd, void (*waypt_add)(waypoint* wpt))
+itracku_device_dump_waypts(void* fd, void (*waypt_add)(Waypoint* wpt))
 {
   itracku_data_record d;
 
@@ -549,7 +549,7 @@ itracku_file_read_last_time(gbfile* fin)
 }
 
 static void
-itracku_file_read_waypts(gbfile* fin, void (*waypt_add)(waypoint* wpt))
+itracku_file_read_waypts(gbfile* fin, void (*waypt_add)(Waypoint* wpt))
 {
   itracku_data_record d;
 
@@ -564,7 +564,7 @@ itracku_file_read_waypts(gbfile* fin, void (*waypt_add)(waypoint* wpt))
 }
 
 static void
-itracku_file_write_waypt(gbfile* fout, const waypoint* wpt)
+itracku_file_write_waypt(gbfile* fout, const Waypoint* wpt)
 {
   itracku_data_record d;
   to_itracku_data_record(wpt, &d);
@@ -572,7 +572,7 @@ itracku_file_write_waypt(gbfile* fout, const waypoint* wpt)
 }
 
 static void
-itracku_waypt_input(void (*waypt_add)(waypoint* wpt))
+itracku_waypt_input(void (*waypt_add)(Waypoint* wpt))
 {
   if (fd) {
     itracku_device_dump_waypts(fd, waypt_add);
@@ -590,7 +590,7 @@ itracku_read_waypt(void)
 static route_head* itracku_read_trk_track;
 
 static void
-itracku_read_trk_waypt_add(waypoint* wpt)
+itracku_read_trk_waypt_add(Waypoint* wpt)
 {
   track_add_wpt(itracku_read_trk_track, wpt);
 }
@@ -635,7 +635,7 @@ itracku_wr_deinit(void)
 }
 
 static void
-itracku_output_waypoint(const waypoint* wp)
+itracku_output_waypoint(const Waypoint* wp)
 {
   itracku_file_write_waypt(fout, wp);
 }
@@ -659,7 +659,7 @@ itracku_rt_init(const char* fname)
 }
 
 static void
-nmea_set_waypoint_time(waypoint* wpt, struct tm* time, double fsec)
+nmea_set_waypoint_time(Waypoint* wpt, struct tm* time, double fsec)
 {
   if (time->tm_year == 0) {
     wpt->SetCreationTime(((((time_t)time->tm_hour * 60) + time->tm_min) * 60) + time->tm_sec, lround(1000.0 * fsec));
@@ -674,7 +674,7 @@ nmea_set_waypoint_time(waypoint* wpt, struct tm* time, double fsec)
   }
 }
 
-static waypoint*
+static Waypoint*
 gprmc_parse(char* ibuf)
 {
   double latdeg, lngdeg;
@@ -683,7 +683,7 @@ gprmc_parse(char* ibuf)
   char fix;
   unsigned int dmy;
   double speed,course;
-  waypoint* waypt;
+  Waypoint* waypt;
   double fsec;
   struct tm tm;
 
@@ -710,7 +710,7 @@ gprmc_parse(char* ibuf)
   dmy = dmy / 100;
   tm.tm_mday = dmy;
 
-  waypt  = new waypoint;
+  waypt  = new Waypoint;
 
   WAYPT_SET(waypt, speed, KNOTS_TO_MPS(speed));
 
@@ -738,11 +738,11 @@ gprmc_parse(char* ibuf)
 
        andreas.grimme@gmx.net
 */
-static waypoint*
+static Waypoint*
 itracku_rt_position(posn_status* posn_status)
 {
   char line[1024];
-  waypoint* wpt;
+  Waypoint* wpt;
   while (1) {
     gbser_read_line(fd, line, sizeof(line), 5000, 13, 10);
     dbg(1, line);
index b8a7037826aa033cee8c4896907a747416f07884..c90db8bfbecc7b0b45078348c64a4654e3051988 100644 (file)
@@ -52,7 +52,7 @@ jogmap_markers(xg_string args, const QXmlStreamAttributes* attrv)
 static void
 jogmap_marker(xg_string args, const QXmlStreamAttributes* attrv)
 {
-  waypoint* wpt = new waypoint;
+  Waypoint* wpt = new Waypoint;
 
   if (attrv->hasAttribute("lat")) {
     wpt->latitude = attrv->value("lat").toString().toDouble();
index 255b64e8e52d117a4a067229b11bfea4ed0586ba..c58a3225e7363857f4243955f4ebe3cef401617a 100644 (file)
@@ -37,7 +37,7 @@ arglist_t jtr_args[] = {
 };
 
 static gbfile* fin, *fout;
-static QHash<QString, const waypoint*> trkpts;
+static QHash<QString, const Waypoint*> trkpts;
 
 static time_t
 jtr_parse_time(const char* str, struct tm* tm, int* milli)
@@ -105,7 +105,7 @@ jtr_read(void)
   route_head* trk = NULL;
 
   while ((str = gbfgetstr(fin))) {
-    waypoint* wpt;
+    Waypoint* wpt;
     struct tm tm;
     char* tmp;
     int column = -1;
@@ -213,7 +213,7 @@ jtr_read(void)
       continue;
     }
 
-    wpt = new waypoint;
+    wpt = new Waypoint;
 
     wpt->latitude = lat;
     wpt->longitude = lon;
@@ -265,7 +265,7 @@ jtr_wr_deinit(void)
 }
 
 static void
-jtr_trkpt_disp_cb(const waypoint* wpt)
+jtr_trkpt_disp_cb(const Waypoint* wpt)
 {
   char* str, *tmp;
   char stime[10], sdate[7], scourse[6], sspeed[8];
index 74a5ce11ed3eccdcc1371b6fea910dcede5f6702..bcbfdfde374e8dc5148569df8d5ee456ae9131b6 100644 (file)
@@ -63,7 +63,7 @@ static int rotate_colors;
 static int line_width;
 static int html_encrypt;
 
-static waypoint* wpt_tmp;
+static Waypoint* wpt_tmp;
 static int wpt_tmp_queued;
 static const char* posnfilename;
 static char* posnfilenametmp;
@@ -272,7 +272,7 @@ const char* kml_tags_to_ignore[] = {
 
 void wpt_s(xg_string args, const QXmlStreamAttributes* unused)
 {
-  wpt_tmp = new waypoint;
+  wpt_tmp = new Waypoint;
   wpt_tmp_queued = 0;
 }
 
@@ -327,7 +327,7 @@ void trk_coord(xg_string args, const QXmlStreamAttributes* attrv)
 {
   int consumed = 0;
   double lat, lon, alt;
-  waypoint* trkpt;
+  Waypoint* trkpt;
   int n = 0;
 
   route_head* trk_head = route_head_alloc();
@@ -338,7 +338,7 @@ void trk_coord(xg_string args, const QXmlStreamAttributes* attrv)
   }
   track_add_head(trk_head);
   while ((n = sscanf(CSTR(iargs), "%lf,%lf,%lf%n", &lon, &lat, &alt, &consumed)) > 0) {
-    trkpt = new waypoint;
+    trkpt = new Waypoint;
     trkpt->latitude = lat;
     trkpt->longitude = lon;
 
@@ -567,7 +567,7 @@ static void kml_write_bitmap_style(kml_point_type pt_type, const char* bitmap,
   writer->writeEndElement(); // Close StyleMap tag
 }
 
-static void kml_output_timestamp(const waypoint* waypointp)
+static void kml_output_timestamp(const Waypoint* waypointp)
 {
   QString time_string = waypointp->CreationTimeXML();
   if (!time_string.isEmpty()) {
@@ -726,7 +726,7 @@ void kml_output_header(const route_head* header, computed_trkdata* td)
 }
 
 static
-int kml_altitude_known(const waypoint* waypoint)
+int kml_altitude_known(const Waypoint* waypoint)
 {
   if (waypoint->altitude == unknown_alt) {
     return 0;
@@ -740,7 +740,7 @@ int kml_altitude_known(const waypoint* waypoint)
 }
 
 static
-void kml_write_coordinates(const waypoint* waypointp)
+void kml_write_coordinates(const Waypoint* waypointp)
 {
   if (kml_altitude_known(waypointp)) {
     writer->writeTextElement("coordinates",
@@ -759,7 +759,7 @@ void kml_write_coordinates(const waypoint* waypointp)
 /* Rather than a default "top down" view, view from the side to highlight
  * topo features.
  */
-static void kml_output_lookat(const waypoint* waypointp)
+static void kml_output_lookat(const Waypoint* waypointp)
 {
   writer->writeStartElement("LookAt");
   writer->writeTextElement("longitude", QString::number(waypointp->longitude, 'f', 6));
@@ -780,7 +780,7 @@ static void kml_output_positioning(void)
 }
 
 /* Output something interesing when we can for route and trackpoints */
-static void kml_output_description(const waypoint* pt)
+static void kml_output_description(const Waypoint* pt)
 {
   const char* alt_units;
   double alt;
@@ -851,7 +851,7 @@ static void kml_output_description(const waypoint* pt)
   writer->writeEndElement(); // Close description tag
 }
 
-static void kml_recompute_time_bounds(const waypoint* waypointp)
+static void kml_recompute_time_bounds(const Waypoint* waypointp)
 {
   if (waypointp->GetCreationTime().isValid()) {
     if (!(kml_time_min.isValid()) ||
@@ -865,13 +865,13 @@ static void kml_recompute_time_bounds(const waypoint* waypointp)
   }
 }
 
-static void kml_add_to_bounds(const waypoint* waypointp)
+static void kml_add_to_bounds(const Waypoint* waypointp)
 {
   waypt_add_to_bounds(&kml_bounds, waypointp);
   kml_recompute_time_bounds(waypointp);
 }
 
-static void kml_output_point(const waypoint* waypointp, kml_point_type pt_type)
+static void kml_output_point(const Waypoint* waypointp, kml_point_type pt_type)
 {
   const char* style;
 
@@ -946,7 +946,7 @@ static void kml_output_tailer(const route_head* header)
     queue* elem, *tmp;
 
     QUEUE_FOR_EACH(&header->waypoint_list, elem, tmp) {
-      waypoint* tpt = (waypoint*) elem;
+      Waypoint* tpt = (Waypoint*) elem;
       int first_in_trk = tpt->Q.prev == &header->waypoint_list;
       if (!first_in_trk && tpt->wpt_flags.new_trkseg) {
         needs_multigeometry = 1;
@@ -983,7 +983,7 @@ static void kml_output_tailer(const route_head* header)
     }
 
     QUEUE_FOR_EACH(&header->waypoint_list, elem, tmp) {
-      waypoint* tpt = (waypoint*) elem;
+      Waypoint* tpt = (Waypoint*) elem;
       int first_in_trk = tpt->Q.prev == &header->waypoint_list;
       if (tpt->wpt_flags.new_trkseg) {
         if (!first_in_trk) {
@@ -1177,7 +1177,7 @@ void kml_gc_make_balloonstyle(void)
 
 static
 char*
-kml_lookup_gc_icon(const waypoint* waypointp)
+kml_lookup_gc_icon(const Waypoint* waypointp)
 {
   const char* icon;
   char* rb;
@@ -1236,7 +1236,7 @@ kml_lookup_gc_icon(const waypoint* waypointp)
 
 static const
 char*
-kml_lookup_gc_container(const waypoint* waypointp)
+kml_lookup_gc_container(const Waypoint* waypointp)
 {
   const char* cont;
 
@@ -1287,7 +1287,7 @@ char* kml_gc_mkstar(int rating)
   return tmp;
 }
 
-QString kml_geocache_get_logs(const waypoint* wpt)
+QString kml_geocache_get_logs(const Waypoint* wpt)
 {
   QString r;
 
@@ -1392,7 +1392,7 @@ static void kml_write_cdata_element(const QString& name, const QString& value)
   writer->writeEndElement(); // Close Data tag
 }
 
-static void kml_geocache_pr(const waypoint* waypointp)
+static void kml_geocache_pr(const Waypoint* waypointp)
 {
   char* is;
   char date_placed[100];  // Always long engough for a date.
@@ -1486,7 +1486,7 @@ static void kml_geocache_pr(const waypoint* waypointp)
  * WAYPOINTS
  */
 
-static void kml_waypt_pr(const waypoint* waypointp)
+static void kml_waypt_pr(const Waypoint* waypointp)
 {
   QString icon;
 
@@ -1568,7 +1568,7 @@ static void kml_track_hdr(const route_head* header)
   xfree(td);
 }
 
-static void kml_track_disp(const waypoint* waypointp)
+static void kml_track_disp(const Waypoint* waypointp)
 {
   kml_output_point(waypointp, kmlpt_track);
 }
@@ -1606,7 +1606,7 @@ static void kml_mt_simple_array(const route_head* header,
 
   QUEUE_FOR_EACH(&header->waypoint_list, elem, tmp) {
 
-    waypoint* wpt = (waypoint*) elem;
+    Waypoint* wpt = (Waypoint*) elem;
 
     switch (member) {
     case fld_power:
@@ -1637,7 +1637,7 @@ static int track_has_time(const route_head* header)
   queue* elem, *tmp;
   int points_with_time = 0;
   QUEUE_FOR_EACH(&header->waypoint_list, elem, tmp) {
-    waypoint* tpt = (waypoint*)elem;
+    Waypoint* tpt = (Waypoint*)elem;
 
     if (tpt->GetCreationTime().isValid()) {
       points_with_time++;
@@ -1655,7 +1655,7 @@ static void write_as_linestring(const route_head* header)
   queue* elem, *tmp;
   kml_track_hdr(header);
   QUEUE_FOR_EACH(&header->waypoint_list, elem, tmp) {
-    waypoint* tpt = (waypoint*)elem;
+    Waypoint* tpt = (Waypoint*)elem;
     kml_track_disp(tpt);
   }
   kml_track_tlr(header);
@@ -1685,7 +1685,7 @@ static void kml_mt_hdr(const route_head* header)
   kml_output_positioning();
 
   QUEUE_FOR_EACH(&header->waypoint_list, elem, tmp) {
-    waypoint* tpt = (waypoint*)elem;
+    Waypoint* tpt = (Waypoint*)elem;
 
     if (tpt->GetCreationTime().isValid()) {
       QString time_string = tpt->CreationTimeXML();
@@ -1698,7 +1698,7 @@ static void kml_mt_hdr(const route_head* header)
 
   // TODO: How to handle clamped, floating, extruded, etc.?
   QUEUE_FOR_EACH(&header->waypoint_list, elem, tmp) {
-    waypoint* tpt = (waypoint*)elem;
+    Waypoint* tpt = (Waypoint*)elem;
 
     if (kml_altitude_known(tpt)) {
       writer->writeTextElement("gx:coord",
@@ -1780,7 +1780,7 @@ static void kml_route_hdr(const route_head* header)
   kml_output_header(header, NULL);
 }
 
-static void kml_route_disp(const waypoint* waypointp)
+static void kml_route_disp(const Waypoint* waypointp)
 {
   kml_output_point(waypointp, kmlpt_route);
 }
@@ -2043,7 +2043,7 @@ kml_get_posn_icon(int freshness)
 static route_head* posn_trk_head = NULL;
 
 static void
-kml_wr_position(waypoint* wpt)
+kml_wr_position(Waypoint* wpt)
 {
   static gpsbabel::DateTime last_valid_fix;
 
@@ -2084,11 +2084,11 @@ kml_wr_position(waypoint* wpt)
      track points if we've not moved a minimum distance from the
      beginnning of our accumulated track. */
   {
-    waypoint* newest_posn= (waypoint*) QUEUE_LAST(&posn_trk_head->waypoint_list);
+    Waypoint* newest_posn= (Waypoint*) QUEUE_LAST(&posn_trk_head->waypoint_list);
 
     if (radtometers(gcdist(RAD(wpt->latitude), RAD(wpt->longitude),
                            RAD(newest_posn->latitude), RAD(newest_posn->longitude))) > 50) {
-      track_add_wpt(posn_trk_head, new waypoint(*wpt));
+      track_add_wpt(posn_trk_head, new Waypoint(*wpt));
     } else {
       /* If we haven't move more than our threshold, pretend
        * we didn't move at  all to prevent Earth from jittering
@@ -2109,7 +2109,7 @@ kml_wr_position(waypoint* wpt)
    */
   while (max_position_points &&
          (posn_trk_head->rte_waypt_ct >= max_position_points)) {
-    waypoint* tonuke = (waypoint*) QUEUE_FIRST(&posn_trk_head->waypoint_list);
+    Waypoint* tonuke = (Waypoint*) QUEUE_FIRST(&posn_trk_head->waypoint_list);
     track_del_wpt(posn_trk_head, tonuke);
   }
 
index 7c4dc30ad3e405691a2a67fde3f9e1eb55562fa3..28de275bc10a822ac231bc3471c064a41c301373 100644 (file)
@@ -32,7 +32,7 @@
 #include "xmlgeneric.h"
 
 static gbfile* ofd;
-static waypoint* wpt_tmp;
+static Waypoint* wpt_tmp;
 QString urllink;
 QString urllinkt;
 static char* binary = NULL;
@@ -194,7 +194,7 @@ lmx_write_xml(int tag, const QString& data, int indent)
 }
 
 static void
-lmx_print(const waypoint* wpt)
+lmx_print(const Waypoint* wpt)
 {
   QString oname;
   QString odesc;
@@ -338,7 +338,7 @@ lmx_rd_deinit(void)
 static void
 lmx_lm_start(xg_string args, const QXmlStreamAttributes* unused)
 {
-  wpt_tmp = new waypoint;
+  wpt_tmp = new Waypoint;
 }
 
 static void
index fc172845888b348f5b3236672ad67922de6c53f5..16391c1851b556e79b034d4ac2ed81f4fdb380d0 100644 (file)
@@ -378,7 +378,7 @@ lat_deg_to_mm(double x)
 }
 
 static void
-lowranceusr_parse_waypt(waypoint* wpt_tmp)
+lowranceusr_parse_waypt(Waypoint* wpt_tmp)
 {
   char buff[MAXUSRSTRINGSIZE + 1];
   int text_len;
@@ -453,7 +453,7 @@ lowranceusr_parse_routes(void)
   short int num_routes, num_legs;
   int i,j;
   int text_len;
-  waypoint* wpt_tmp;
+  Waypoint* wpt_tmp;
 
   num_routes = gbfgetint16(file_in);
 
@@ -481,7 +481,7 @@ lowranceusr_parse_routes(void)
 
     /* waypoints */
     for (j=0; j < num_legs; j++) {
-      wpt_tmp = new waypoint;
+      wpt_tmp = new Waypoint;
       lowranceusr_parse_waypt(wpt_tmp);
       route_add_wpt(rte_head, wpt_tmp);
     }
@@ -512,8 +512,8 @@ lowranceusr_parse_icons(void)
       /* symbol */
       (void) gbfread(&buff[0], 4, 1, file_in);
     } else {
-      waypoint* wpt_tmp;
-      wpt_tmp = new waypoint;
+      Waypoint* wpt_tmp;
+      wpt_tmp = new Waypoint;
 
       /* position coord lat & long */
       wpt_tmp->latitude = lat_mm_to_deg(gbfgetint32(file_in));
@@ -536,7 +536,7 @@ lowranceusr_parse_trails(void)
   short int num_trails, num_trail_points, num_section_points;
   int i,j, trk_num, itmp;
   int text_len;
-  waypoint* wpt_tmp;
+  Waypoint* wpt_tmp;
   route_head* trk_tmp;
 
   /* num trails */
@@ -594,7 +594,7 @@ lowranceusr_parse_trails(void)
         }
 
         for (j=0; j < num_section_points; j++, num_trail_points--) {
-          wpt_tmp = new waypoint;
+          wpt_tmp = new Waypoint;
           wpt_tmp->latitude = lat_mm_to_deg(gbfgetint32(file_in));
           wpt_tmp->longitude = lon_mm_to_deg(gbfgetint32(file_in));
           /* continuous */
@@ -653,9 +653,9 @@ data_read(void)
   }
 
   for (i = 0; i < NumWaypoints; i++) {
-    waypoint* wpt_tmp;
+    Waypoint* wpt_tmp;
 
-    wpt_tmp = new waypoint;
+    wpt_tmp = new Waypoint;
 
     /* Object num */
     object_num = gbfgetint16(file_in);
@@ -675,7 +675,7 @@ data_read(void)
 }
 
 static void
-lowranceusr_waypt_disp(const waypoint* wpt)
+lowranceusr_waypt_disp(const Waypoint* wpt)
 {
   int text_len, Lat, Lon, Time, SymbolId;
   short int WayptType;
@@ -805,7 +805,7 @@ lowranceusr_waypt_disp(const waypoint* wpt)
 }
 
 static void
-lowranceusr_waypt_pr(const waypoint* wpt)
+lowranceusr_waypt_pr(const Waypoint* wpt)
 {
 
   /* our personal waypoint counter */
@@ -829,7 +829,7 @@ lowranceusr_waypt_pr(const waypoint* wpt)
  * 4 bytes symbol
  */
 static void
-lowranceusr_write_icon(const waypoint* wpt)
+lowranceusr_write_icon(const Waypoint* wpt)
 {
   int latmm = lat_deg_to_mm(wpt->latitude);
   int lonmm = lon_deg_to_mm(wpt->longitude);
@@ -964,7 +964,7 @@ lowranceusr_route_hdr(const route_head* rte)
 }
 
 static void
-lowranceusr_track_disp(const waypoint* wpt)
+lowranceusr_track_disp(const Waypoint* wpt)
 {
   int lat, lon;
 
index ff82f5fa1c9ac91f4bbfdddb4f10b4e03880479c..e7a492c937e9e22c1f53f9185483b9c368af4605 100644 (file)
@@ -46,7 +46,7 @@ static int waypt_uid;
 static int route_uid;
 static int track_uid;
 
-static waypoint** waypt_table;
+static Waypoint** waypt_table;
 static int waypt_table_sz, waypt_table_ct;
 
 static char* opt_title;
@@ -282,7 +282,7 @@ lowranceusr4_alloc_fsdata(void)
 
 /* make waypoint shortnames unique */
 static char
-same_points(const waypoint* A, const waypoint* B)
+same_points(const Waypoint* A, const Waypoint* B)
 {
   return ( /* !!! We are case-sensitive !!! */
 #if NEW_STRINGS
@@ -295,13 +295,13 @@ same_points(const waypoint* A, const waypoint* B)
 }
 
 static void
-register_waypt(const waypoint* ref)
+register_waypt(const Waypoint* ref)
 {
   int i;
-  waypoint* wpt = (waypoint*) ref;
+  Waypoint* wpt = (Waypoint*) ref;
 
   for (i = 0; i < waypt_table_ct; i++) {
-    waypoint* cmp = waypt_table[i];
+    Waypoint* cmp = waypt_table[i];
 
     if (same_points(wpt, cmp)) {
       return;
@@ -311,9 +311,9 @@ register_waypt(const waypoint* ref)
   if (waypt_table_ct >= waypt_table_sz) {
     waypt_table_sz += 32;
     if (waypt_table) {
-      waypt_table = (waypoint**) xrealloc(waypt_table, waypt_table_sz * sizeof(wpt));
+      waypt_table = (Waypoint**) xrealloc(waypt_table, waypt_table_sz * sizeof(wpt));
     } else {
-      waypt_table = (waypoint**) xmalloc(waypt_table_sz * sizeof(wpt));
+      waypt_table = (Waypoint**) xmalloc(waypt_table_sz * sizeof(wpt));
     }
   }
 
@@ -322,18 +322,18 @@ register_waypt(const waypoint* ref)
            CSTRc(wpt->shortname), CSTRc(wpt->description), waypt_table_ct);
   }
 
-  waypt_table[waypt_table_ct] = (waypoint*)wpt;
+  waypt_table[waypt_table_ct] = (Waypoint*)wpt;
   waypt_table_ct++;
 }
 
 /* end borrowed from raymarine.c */
 
 static int
-lowranceusr4_find_waypt_index(const waypoint* wpt)
+lowranceusr4_find_waypt_index(const Waypoint* wpt)
 {
   int i;
   for (i = 0; i < waypt_table_ct; ++i) {
-    if (same_points(wpt, (const waypoint*)waypt_table[i])) {
+    if (same_points(wpt, (const Waypoint*)waypt_table[i])) {
       return i;
     }
   }
@@ -357,9 +357,9 @@ lowranceusr4_parse_waypoints(void)
   }
 
   for (i = 0; i < num_waypts; ++i) {
-    waypoint* wpt_tmp;
+    Waypoint* wpt_tmp;
 
-    wpt_tmp = new waypoint;
+    wpt_tmp = new Waypoint;
     lowranceusr4_fsdata* fsdata = lowranceusr4_alloc_fsdata();
     fs_chain_add(&(wpt_tmp->fs), (format_specific_data*) fsdata);
 
@@ -470,15 +470,15 @@ lowranceusr4_parse_waypoints(void)
   }
 }
 
-static waypoint*
+static Waypoint*
 lowranceusr4_find_waypt(int uid_unit, int uid_seq_low, int uid_seq_high)
 {
   queue* elem, *tmp;
-  waypoint* waypointp;
+  Waypoint* waypointp;
   lowranceusr4_fsdata* fs = NULL;
 
   QUEUE_FOR_EACH(&waypt_head, elem, tmp) {
-    waypointp = (waypoint*) elem;
+    waypointp = (Waypoint*) elem;
     fs = (lowranceusr4_fsdata*) fs_chain_find(waypointp->fs, FS_LOWRANCEUSR4);
 
     if (fs && fs->uid_unit == uid_unit &&
@@ -501,7 +501,7 @@ lowranceusr4_parse_routes(void)
   unsigned int num_routes, i, j, text_len;
   unsigned int num_legs;
   char buff[MAXUSRSTRINGSIZE + 1];
-  waypoint* wpt_tmp;
+  Waypoint* wpt_tmp;
   unsigned int uid_unit, uid_seq_low, uid_seq_high;
 
   num_routes = gbfgetint32(file_in);
@@ -564,7 +564,7 @@ lowranceusr4_parse_routes(void)
           printf(MYNAME " parse_routes: added wpt %s to route %s\n",
                  CSTRc(wpt_tmp->shortname), CSTRc(rte_head->rte_name));
         }
-        route_add_wpt(rte_head, new waypoint(*wpt_tmp));
+        route_add_wpt(rte_head, new Waypoint(*wpt_tmp));
       }
     }
 
@@ -578,7 +578,7 @@ lowranceusr4_parse_trails(void)
 {
   int num_trails, num_trail_pts, M, i, j, k, trk_num, text_len;
   char buff[MAXUSRSTRINGSIZE + 1];
-  waypoint* wpt_tmp;
+  Waypoint* wpt_tmp;
 
   /* num trails */
   num_trails = gbfgetint32(file_in);
@@ -683,7 +683,7 @@ lowranceusr4_parse_trails(void)
     }
 
     for (j = 0; j < num_trail_pts; ++j) {
-      wpt_tmp = new waypoint;
+      wpt_tmp = new Waypoint;
 
       /* Some unknown bytes */
       gbfgetint16(file_in);
@@ -773,7 +773,7 @@ data_read(void)
 
 
 static void
-lowranceusr4_waypt_disp(const waypoint* wpt)
+lowranceusr4_waypt_disp(const Waypoint* wpt)
 {
   /* UID unit number */
   gbfputint32(opt_serialnum_i, file_out);
@@ -850,7 +850,7 @@ lowranceusr4_write_waypoints(void)
       printf(MYNAME " writing out waypt %d (%s - %s)\n",
              i, CSTRc(waypt_table[i]->shortname), CSTRc(waypt_table[i]->description));
     }
-    lowranceusr4_waypt_disp((const waypoint*)waypt_table[i]);
+    lowranceusr4_waypt_disp((const Waypoint*)waypt_table[i]);
   }
 }
 
@@ -880,7 +880,7 @@ lowranceusr4_write_route_hdr(const route_head* rte)
 }
 
 static void
-lowranceusr4_write_wpt_uids(const waypoint* wpt)
+lowranceusr4_write_wpt_uids(const Waypoint* wpt)
 {
   int waypt_idx;
 
@@ -976,7 +976,7 @@ lowranceusr4_write_track_hdr(const route_head* trk)
 }
 
 static void
-lowranceusr4_write_track_waypt(const waypoint* wpt)
+lowranceusr4_write_track_waypt(const Waypoint* wpt)
 {
   /* Some unknown bytes */
   gbfputint16(0, file_out);
index cfa740660edee73d131e6cf6ab1cd54a191e24ef..69fa0e95356c900c7e713b8f7366c85194bea7e4 100644 (file)
@@ -50,5 +50,5 @@ QString mag_find_token_from_descr(const QString& icon);
 unsigned int mag_checksum(const char* const buf);
 QString m330_cleanse(const char* istring);
 
-waypoint* mag_trkparse(char* trkmsg);
+Waypoint* mag_trkparse(char* trkmsg);
 void mag_rteparse(char* rtemsg);
index 9064fa7a281f335b6addad1062fa2d3c3f87ab76..f313404634761f655b6f0b2155dcee23e8d5cb95 100644 (file)
@@ -85,7 +85,7 @@ maggeo_read(void)
   char* buff;
 
   while ((buff = gbfgetstr(maggeofile_in))) {
-    waypoint* wpt_tmp;
+    Waypoint* wpt_tmp;
     geocache_data* gcdata;
     char* s = NULL;
     int fld;
@@ -101,7 +101,7 @@ maggeo_read(void)
     buff += 9; /* skip field no. 1 */
     fld = 1;
 
-    wpt_tmp = new waypoint;
+    wpt_tmp = new Waypoint;
     gcdata = wpt_tmp->AllocGCData();
 
     while ((s = csv_lineparse(buff, ",", "", fld++))) {
@@ -236,7 +236,7 @@ append(char* buf, const char* str)
 }
 
 static void
-maggeo_waypt_pr(const waypoint* waypointp)
+maggeo_waypt_pr(const Waypoint* waypointp)
 {
   char obuf[4096];
   double ilon, ilat;
index 3fc9b76cd5e0088dfaec82fae43db5266fd55c1f..7c53a3591137cba113de44b2e8485ea5c59326db 100644 (file)
@@ -111,7 +111,7 @@ static int is_file = 0;
 static route_head* trk_head;
 static int ignore_unable;
 
-static waypoint* mag_wptparse(char*);
+static Waypoint* mag_wptparse(char*);
 typedef QString (cleanse_fn)(const char*);
 static cleanse_fn* mag_cleanse;
 static const char** os_get_magellan_mountpoints();
@@ -487,7 +487,7 @@ retry:
     return;
   }
   if (strncmp(ibuf, "$PMGNWPL,", 7) == 0) {
-    waypoint* wpt = mag_wptparse(ibuf);
+    Waypoint* wpt = mag_wptparse(ibuf);
     waypoint_read_count++;
     if (global_opts.verbose_status) {
       waypt_status_disp(waypoint_read_count,
@@ -514,7 +514,7 @@ retry:
     }
   }
   if (strncmp(ibuf, "$PMGNTRK,", 7) == 0) {
-    waypoint* wpt = mag_trkparse(ibuf);
+    Waypoint* wpt = mag_trkparse(ibuf);
     /*
      * Allow lazy allocation of track head.
      */
@@ -961,7 +961,7 @@ void parse_istring(char* istring)
  * $PMGNTRK,3605.259,N,08644.389,W,00151,M,201444.61,A,,020302*66
  * create and return a populated waypoint.
  */
-waypoint*
+Waypoint*
 mag_trkparse(char* trkmsg)
 {
   double latdeg, lngdeg;
@@ -972,9 +972,9 @@ mag_trkparse(char* trkmsg)
   int hms;
   int fracsecs;
   struct tm tm;
-  waypoint* waypt;
+  Waypoint* waypt;
 
-  waypt  = new waypoint;
+  waypt  = new Waypoint;
 
   memset(&tm, 0, sizeof(tm));
 
@@ -1142,20 +1142,20 @@ mag_rteparse(char* rtemsg)
 
     QUEUE_FOR_EACH(&mag_rte_head->Q, elem, tmp) {
       mag_rte_elem* re = (mag_rte_elem*) elem;
-      waypoint* waypt;
+      Waypoint* waypt;
       queue* welem, *wtmp;
 
       /*
        * Copy route points from temp wpt queue.
        */
       QUEUE_FOR_EACH(&rte_wpt_tmp, welem, wtmp) {
-        waypt = (waypoint*)welem;
+        waypt = (Waypoint*)welem;
 #if NEW_STRINGS
         if (waypt->shortname == re->wpt_name) {
 #else
         if (strcmp(waypt->shortname, re->wpt_name) == 0) {
 #endif
-          waypoint* wpt = new waypoint(*waypt);
+          Waypoint* wpt = new Waypoint(*waypt);
           route_add_wpt(rte_head, wpt);
           break;
         }
@@ -1215,7 +1215,7 @@ mag_find_token_from_descr(const QString& icon)
  * $PMGNWPL,3549.499,N,08650.827,W,0000257,M,HOME,HOME,c*4D
  * create and return a populated waypoint.
  */
-static waypoint*
+static Waypoint*
 mag_wptparse(char* trkmsg)
 {
   double latdeg, lngdeg;
@@ -1226,7 +1226,7 @@ mag_wptparse(char* trkmsg)
   char shortname[100];
   char descr[256];
   char icon_token[100];
-  waypoint* waypt;
+  Waypoint* waypt;
   char* icons;
   char* icone;
   char* blah;
@@ -1235,7 +1235,7 @@ mag_wptparse(char* trkmsg)
   descr[0] = 0;
   icon_token[0] = 0;
 
-  waypt  = new waypoint;
+  waypt  = new Waypoint;
 
   sscanf(trkmsg,"$PMGNWPL,%lf,%c,%lf,%c,%d,%c,%[^,],%[^,]",
          &latdeg,&latdir,
@@ -1355,7 +1355,7 @@ mag_read(void)
 
 static
 void
-mag_waypt_pr(const waypoint* waypointp)
+mag_waypt_pr(const Waypoint* waypointp)
 {
   double lon, lat;
   double ilon, ilat;
@@ -1453,7 +1453,7 @@ void mag_track_nop(const route_head*)
 }
 
 static
-void mag_track_disp(const waypoint* waypointp)
+void mag_track_disp(const Waypoint* waypointp)
 {
   double ilon, ilat;
   double lon, lat;
@@ -1527,7 +1527,7 @@ static void
 mag_route_trl(const route_head* rte)
 {
   queue* elem, *tmp;
-  waypoint* waypointp;
+  Waypoint* waypointp;
   char obuff[256];
   char buff1[64], buff2[64];
   char* pbuff, *owpt;
@@ -1545,7 +1545,7 @@ mag_route_trl(const route_head* rte)
 
   thisline = i = 0;
   QUEUE_FOR_EACH(&rte->waypoint_list, elem, tmp) {
-    waypointp = (waypoint*) elem;
+    waypointp = (Waypoint*) elem;
     i++;
 
     if (deficon) {
index 1bb72abd8ab769a489ad914b9c7838e22c281613..6d48a3afd357dbe94395b3988aee8012b1bea056 100644 (file)
@@ -689,7 +689,7 @@ main(int argc, char* argv[])
 
     tracking_status.request_terminate = 0;
     while (!tracking_status.request_terminate) {
-      waypoint* wpt;
+      Waypoint* wpt;
 
       wpt = ivecs->position_ops.rd_position(&tracking_status);
 
index 5166e7dc1705a2a9345cf4a3373c59fc57bbaf17..915c7dd5ec77a1c747f0283b8fd03ec7cae30b84 100644 (file)
@@ -47,7 +47,7 @@
 #define TR7_S_FIX      29
 
 static gbfile* fin, *fout;
-static const waypoint* wpt_tmp;
+static const Waypoint* wpt_tmp;
 static const route_head* trk_tmp;
 static int course_tmp, speed_tmp;
 
@@ -71,7 +71,7 @@ tr7_read(void)
 {
   route_head* trk = NULL;
   unsigned int magic;
-  waypoint* prev = NULL;
+  Waypoint* prev = NULL;
 
   magic = gbfgetint32(fin);
   if (magic != TR7_TRACK_MAGIC) {
@@ -81,7 +81,7 @@ tr7_read(void)
   while (! gbfeof(fin)) {
     unsigned char buff[TR7_S_SIZE];
     double lat, lon;
-    waypoint* wpt;
+    Waypoint* wpt;
     float speed, course;
 
     gbfread(buff, 1, sizeof(buff), fin);
@@ -110,7 +110,7 @@ tr7_read(void)
       continue;
     }
 
-    wpt = new waypoint;
+    wpt = new Waypoint;
 
     wpt->latitude = lat;
     wpt->longitude = lon;
@@ -158,7 +158,7 @@ tr7_check_after_read_head_cb(const route_head* trk)
 }
 
 static void
-tr7_check_after_read_wpt_cb(const waypoint* wpt)
+tr7_check_after_read_wpt_cb(const Waypoint* wpt)
 {
   if (wpt->speed != 0) {
     speed_tmp = 1;
@@ -173,7 +173,7 @@ tr7_check_after_read_trailer_cb(const route_head* trk)
 {
   queue* elem, *tmp;
   QUEUE_FOR_EACH((queue*)&trk->waypoint_list, elem, tmp) {
-    waypoint* wpt = (waypoint*)elem;
+    Waypoint* wpt = (Waypoint*)elem;
     if (speed_tmp == 0) {
       WAYPT_UNSET(wpt, speed);
     }
@@ -205,7 +205,7 @@ tr7_disp_track_head_cb(const route_head* trk)
 }
 
 static void
-tr7_disp_waypt_cb(const waypoint* wpt)
+tr7_disp_waypt_cb(const Waypoint* wpt)
 {
   unsigned char buff[TR7_S_SIZE];
   double speed, course;
index aa152a310bf5df44b7d57be1a141db2a6c48ff92..4b72828fbfc69291b4f044dbe91646b7062f5469 100644 (file)
@@ -64,13 +64,13 @@ read_datetime(void)
 }
 
 static const double DIV_RATE  = 100000.0f;
-static waypoint*
+static Waypoint*
 read_waypoint(void)
 {
   int longitude = gbfgetint32(fin);
   int latitude = gbfgetint32(fin);
 
-  waypoint* ret = new waypoint;
+  Waypoint* ret = new Waypoint;
 
   ret->latitude = double(latitude)/DIV_RATE;
   ret->longitude = double(longitude)/DIV_RATE;
@@ -115,7 +115,7 @@ mapbar_track_read(void)
 
     const int amount = length/8;
     for (int i = 0; i < amount; ++i) {
-      waypoint* tmp = read_waypoint();
+      Waypoint* tmp = read_waypoint();
       track_add_wpt(track, tmp);
     }
 
index 91623c5a0221d95df5f30e0b1904e26037e1e909..a13d735bf469e9d92e2b94f26988b59dad0fbf3e 100644 (file)
@@ -115,13 +115,13 @@ mapsend_wpt_read(void)
   int wpt_number;
   char wpt_icon;
   char wpt_status;
-  waypoint* wpt_tmp;
+  Waypoint* wpt_tmp;
   route_head* rte_head;
 
   wpt_count = gbfgetint32(mapsend_file_in);
 
   while (wpt_count--) {
-    wpt_tmp = new waypoint;
+    wpt_tmp = new Waypoint;
 
     wpt_tmp->shortname = gbfgetpstr(mapsend_file_in);
     wpt_tmp->description = gbfgetpstr(mapsend_file_in);
@@ -162,7 +162,7 @@ mapsend_wpt_read(void)
     wpt_count = gbfgetint32(mapsend_file_in);
 
     while (wpt_count--) {
-      wpt_tmp = new waypoint;
+      wpt_tmp = new Waypoint;
 
       /* waypoint name */
       wpt_tmp->shortname = gbfgetpstr(mapsend_file_in);
@@ -193,7 +193,7 @@ mapsend_track_read(void)
   int valid;
   unsigned char centisecs;
   route_head* track_head;
-  waypoint* wpt_tmp;
+  Waypoint* wpt_tmp;
 
   track_head = route_head_alloc();
   track_head->rte_name = gbfgetpstr(mapsend_file_in);
@@ -202,7 +202,7 @@ mapsend_track_read(void)
   trk_count = gbfgetuint32(mapsend_file_in);
 
   while (trk_count--) {
-    wpt_tmp = new waypoint;
+    wpt_tmp = new Waypoint;
 
     wpt_tmp->longitude = gbfgetdbl(mapsend_file_in);
     wpt_tmp->latitude = -gbfgetdbl(mapsend_file_in);
@@ -270,7 +270,7 @@ mapsend_read(void)
 
 
 static void
-mapsend_waypt_pr(const waypoint* waypointp)
+mapsend_waypt_pr(const Waypoint* waypointp)
 {
   unsigned int c = 0;
   double falt;
@@ -385,7 +385,7 @@ mapsend_noop(const route_head* wp)
 }
 
 static void
-mapsend_route_disp(const waypoint* waypointp)
+mapsend_route_disp(const Waypoint* waypointp)
 {
   unsigned char c;
   QString iconp;
@@ -483,7 +483,7 @@ void mapsend_track_hdr(const route_head* trk)
 
 }
 
-void mapsend_track_disp(const waypoint* wpt)
+void mapsend_track_disp(const Waypoint* wpt)
 {
   unsigned char c;
   int32_t t;
index 491e8f434d76f2c971333fa4f60e0e492513257a..e2bfb9916a7d9bb2436704367fcd2dcf2c0ee02e 100644 (file)
@@ -42,7 +42,7 @@ static        int             mps_ver_temp = 0;
 static char* tempname;
 static char* fin_name;
 
-static const waypoint* prevRouteWpt;
+static const Waypoint* prevRouteWpt;
 /* Private queues of written out waypoints */
 static queue written_wpt_head;
 static queue written_route_wpt_head;
@@ -125,7 +125,7 @@ mps_wpt_q_deinit(queue* whichQueue)
   queue* elem, *tmp;
 
   QUEUE_FOR_EACH(whichQueue, elem, tmp) {
-    waypoint* q = (waypoint*) dequeue(elem);
+    Waypoint* q = (Waypoint*) dequeue(elem);
     delete q;
   }
 }
@@ -134,14 +134,14 @@ mps_wpt_q_deinit(queue* whichQueue)
  * Find a waypoint that we've already written out
  *
  */
-waypoint*
+Waypoint*
 mps_find_wpt_q_by_name(const queue* whichQueue, const QString& name)
 {
   queue* elem, *tmp;
-  waypoint* waypointp;
+  Waypoint* waypointp;
 
   QUEUE_FOR_EACH(whichQueue, elem, tmp) {
-    waypointp = (waypoint*) elem;
+    waypointp = (Waypoint*) elem;
     if (waypointp->shortname == name) {
       return waypointp;
     }
@@ -154,9 +154,9 @@ mps_find_wpt_q_by_name(const queue* whichQueue, const QString& name)
  *
  */
 void
-mps_wpt_q_add(const queue* whichQueue, const waypoint* wpt)
+mps_wpt_q_add(const queue* whichQueue, const Waypoint* wpt)
 {
-  waypoint* written_wpt = new waypoint(*wpt);
+  Waypoint* written_wpt = new Waypoint(*wpt);
   ENQUEUE_TAIL(whichQueue, &written_wpt->Q);
 }
 
@@ -513,7 +513,7 @@ mps_mapsetname_w(gbfile* mps_file, int mps_ver)
  * MRCB
  */
 static void
-mps_waypoint_r(gbfile* mps_file, int mps_ver, waypoint** wpt, unsigned int* mpsclass)
+mps_waypoint_r(gbfile* mps_file, int mps_ver, Waypoint** wpt, unsigned int* mpsclass)
 {
   char tbuf[100];
   char wptname[MPSNAMEBUFFERLEN];
@@ -522,12 +522,12 @@ mps_waypoint_r(gbfile* mps_file, int mps_ver, waypoint** wpt, unsigned int* mpsc
   int  icon;
   int dynamic;
 
-  waypoint*    thisWaypoint = NULL;
+  Waypoint*    thisWaypoint = NULL;
   double       mps_altitude = unknown_alt;
   double       mps_proximity = unknown_alt;
   double       mps_depth = unknown_alt;
 
-  thisWaypoint = new waypoint;
+  thisWaypoint = new Waypoint;
   *wpt = thisWaypoint;
 
   mps_readstr(mps_file, wptname, sizeof(wptname));
@@ -611,7 +611,7 @@ mps_waypoint_r(gbfile* mps_file, int mps_ver, waypoint** wpt, unsigned int* mpsc
  * MRCB
  */
 static void
-mps_waypoint_w(gbfile* mps_file, int mps_ver, const waypoint* wpt, const int isRouteWpt)
+mps_waypoint_w(gbfile* mps_file, int mps_ver, const Waypoint* wpt, const int isRouteWpt)
 {
   int reclen;
   int lat, lon;
@@ -765,9 +765,9 @@ mps_waypoint_w(gbfile* mps_file, int mps_ver, const waypoint* wpt, const int isR
  *
  */
 static void
-mps_waypoint_w_unique_wrapper(const waypoint* wpt)
+mps_waypoint_w_unique_wrapper(const Waypoint* wpt)
 {
-  waypoint* wptfound = NULL;
+  Waypoint* wptfound = NULL;
 
   /* Search for this waypoint in the ones already written */
   wptfound = mps_find_wpt_q_by_name(&written_wpt_head, CSTRc(wpt->shortname));
@@ -795,9 +795,9 @@ mps_waypoint_w_unique_wrapper(const waypoint* wpt)
  *
  */
 static void
-mps_route_wpt_w_unique_wrapper(const waypoint* wpt)
+mps_route_wpt_w_unique_wrapper(const Waypoint* wpt)
 {
-  waypoint* wptfound = NULL;
+  Waypoint* wptfound = NULL;
 
   /* Search for this waypoint in the ones already written */
   wptfound = mps_find_wpt_q_by_name(&written_wpt_head, CSTRc(wpt->shortname));
@@ -834,9 +834,9 @@ mps_route_wpt_w_unique_wrapper(const waypoint* wpt)
  *
  */
 static void
-mps_waypoint_w_uniqloc_wrapper(waypoint* wpt)
+mps_waypoint_w_uniqloc_wrapper(Waypoint* wpt)
 {
-  waypoint* wptfound = NULL;
+  Waypoint* wptfound = NULL;
   char*                        newName;
 
   /* Search for this waypoint in the ones already written */
@@ -856,7 +856,7 @@ mps_waypoint_w_uniqloc_wrapper(waypoint* wpt)
         ((wpt->longitude - wptfound->longitude) != 0)) {
       /* Not the same lat lon, so rename and add */
       newName = mkshort(written_wpt_mkshort_handle, wpt->shortname);
-      wptfound = new waypoint(*wpt);
+      wptfound = new Waypoint(*wpt);
       xfree(wptfound->shortname);
       wptfound->shortname = newName;
       mps_waypoint_w(mps_file_out, mps_ver_out, wptfound, (1==0));
@@ -890,8 +890,8 @@ mps_route_r(gbfile* mps_file, int mps_ver, route_head** rte)
   route_head* rte_head;
   int rte_count;
 
-  waypoint*    thisWaypoint;
-  waypoint*    tempWpt;
+  Waypoint*    thisWaypoint;
+  Waypoint*    tempWpt;
 
   double       mps_altitude = unknown_alt;
   double       mps_depth = unknown_alt;
@@ -1008,18 +1008,18 @@ mps_route_r(gbfile* mps_file, int mps_ver, route_head** rte)
     tempWpt = find_waypt_by_name(wptname);
 
     if (tempWpt != NULL) {
-      thisWaypoint = new waypoint(*tempWpt);
+      thisWaypoint = new Waypoint(*tempWpt);
     } else {
       tempWpt = mps_find_wpt_q_by_name(&read_route_wpt_head, wptname);
 
       if (tempWpt != NULL) {
-        thisWaypoint = new waypoint(*tempWpt);
+        thisWaypoint = new Waypoint(*tempWpt);
       } else {
         /* should never reach here, but we do need a fallback position */
 #ifdef MPS_DEBUG
         fprintf(stderr, "mps_route_r: reached the point we never should\n");
 #endif
-        thisWaypoint = new waypoint;
+        thisWaypoint = new Waypoint;
         thisWaypoint->shortname = wptname;
         thisWaypoint->latitude = GPS_Math_Semi_To_Deg(lat);
         thisWaypoint->longitude = GPS_Math_Semi_To_Deg(lon);
@@ -1095,15 +1095,15 @@ mps_route_r(gbfile* mps_file, int mps_ver, route_head** rte)
   tempWpt = find_waypt_by_name(wptname);
 
   if (tempWpt != NULL) {
-    thisWaypoint = new waypoint(*tempWpt);
+    thisWaypoint = new Waypoint(*tempWpt);
   } else {
     tempWpt = mps_find_wpt_q_by_name(&read_route_wpt_head, wptname);
 
     if (tempWpt != NULL) {
-      thisWaypoint = new waypoint(*tempWpt);
+      thisWaypoint = new Waypoint(*tempWpt);
     } else {
       /* should never reach here, but we do need a fallback position */
-      thisWaypoint = new waypoint;
+      thisWaypoint = new Waypoint;
       thisWaypoint->shortname = wptname;
       thisWaypoint->latitude = GPS_Math_Semi_To_Deg(lat);
       thisWaypoint->longitude = GPS_Math_Semi_To_Deg(lon);
@@ -1130,7 +1130,7 @@ mps_routehdr_w(gbfile* mps_file, int mps_ver, const route_head* rte)
   char         hdr[20];
   char         zbuf[20];
 
-  waypoint*    testwpt;
+  Waypoint*    testwpt;
   time_t               uniqueValue = 0;
   int                  allWptNameLengths;
 
@@ -1156,7 +1156,7 @@ mps_routehdr_w(gbfile* mps_file, int mps_ver, const route_head* rte)
 
   if (rte->waypoint_list.next) {               /* this test doesn't do what I want i.e test if this is a valid route - treat as a placeholder for now */
     QUEUE_FOR_EACH(&rte->waypoint_list, elem, tmp) {
-      testwpt = (waypoint*)elem;
+      testwpt = (Waypoint*)elem;
       if (rte_datapoints == 0) {
         uniqueValue = testwpt->GetCreationTime().toTime_t();
       }
@@ -1286,7 +1286,7 @@ mps_routehdr_w_wrapper(const route_head* rte)
  * MRCB
  */
 static void
-mps_routedatapoint_w(gbfile* mps_file, int mps_ver, const waypoint* rtewpt)
+mps_routedatapoint_w(gbfile* mps_file, int mps_ver, const Waypoint* rtewpt)
 {
   int                  lat;
   int                  lon;
@@ -1302,7 +1302,7 @@ mps_routedatapoint_w(gbfile* mps_file, int mps_ver, const waypoint* rtewpt)
   double               minalt=-unknown_alt;
 
   double               mps_altitude;
-  waypoint*    wptfound;
+  Waypoint*    wptfound;
 
   memset(zbuf, 0, sizeof(zbuf));
   memset(ffbuf, 0xff, sizeof(ffbuf));
@@ -1450,7 +1450,7 @@ mps_routedatapoint_w(gbfile* mps_file, int mps_ver, const waypoint* rtewpt)
 }
 
 static void
-mps_routedatapoint_w_wrapper(const waypoint* rte)
+mps_routedatapoint_w_wrapper(const Waypoint* rte)
 {
   mps_routedatapoint_w(mps_file_out, mps_ver_out, rte);
 }
@@ -1496,7 +1496,7 @@ mps_track_r(gbfile* mps_file, int mps_ver, route_head** trk)
   route_head* track_head;
   int trk_count;
 
-  waypoint*    thisWaypoint;
+  Waypoint*    thisWaypoint;
   double       mps_altitude = unknown_alt;
   double       mps_depth = unknown_alt;
 
@@ -1553,7 +1553,7 @@ mps_track_r(gbfile* mps_file, int mps_ver, route_head** trk)
       gbfseek(mps_file, 8, SEEK_CUR);
     }
 
-    thisWaypoint = new waypoint;
+    thisWaypoint = new Waypoint;
     thisWaypoint->latitude = GPS_Math_Semi_To_Deg(lat);
     thisWaypoint->longitude = GPS_Math_Semi_To_Deg(lon);
     thisWaypoint->SetCreationTime(dateTime);
@@ -1582,7 +1582,7 @@ mps_trackhdr_w(gbfile* mps_file, int mps_ver, const route_head* trk)
   int                  tname_len;
   char*                tname;
   char         hdr[20];
-  waypoint*    testwpt;
+  Waypoint*    testwpt;
   time_t               uniqueValue = 0;
 
   queue* elem, *tmp;
@@ -1594,7 +1594,7 @@ mps_trackhdr_w(gbfile* mps_file, int mps_ver, const route_head* trk)
   if (trk->waypoint_list.next) {       /* this test doesn't do what I want i.e test if this is a valid track - treat as a placeholder for now */
     QUEUE_FOR_EACH(&trk->waypoint_list, elem, tmp) {
       if (trk_datapoints == 0) {
-        testwpt = (waypoint*)elem;
+        testwpt = (Waypoint*)elem;
         uniqueValue = testwpt->GetCreationTime().toTime_t();
       }
       trk_datapoints++;
@@ -1647,7 +1647,7 @@ mps_trackhdr_w_wrapper(const route_head* trk)
  * MRCB
  */
 static void
-mps_trackdatapoint_w(gbfile* mps_file, int mps_ver, const waypoint* wpt)
+mps_trackdatapoint_w(gbfile* mps_file, int mps_ver, const Waypoint* wpt)
 {
   int lat, lon;
   time_t       t = wpt->GetCreationTime().toTime_t();
@@ -1692,7 +1692,7 @@ mps_trackdatapoint_w(gbfile* mps_file, int mps_ver, const waypoint* wpt)
 }
 
 static void
-mps_trackdatapoint_w_wrapper(const waypoint* wpt)
+mps_trackdatapoint_w_wrapper(const Waypoint* wpt)
 {
   mps_trackdatapoint_w(mps_file_out, mps_ver_out, wpt);
 }
@@ -1701,7 +1701,7 @@ mps_trackdatapoint_w_wrapper(const waypoint* wpt)
 static void
 mps_read(void)
 {
-  waypoint*            wpt;
+  Waypoint*            wpt;
   route_head*          rte;
   route_head*          trk;
 
@@ -1826,7 +1826,7 @@ void
 mps_write(void)
 {
   int                          short_length;
-  waypoint*            wpt;
+  Waypoint*            wpt;
   route_head*          rte;
   route_head*          trk;
 
index 167c1de63738483ace76dca49ca6d47ffd650ffc..5d92cfecaad562e8e8dd3b0a51a1568a8e385dd6 100644 (file)
@@ -586,7 +586,7 @@ mkshort(short_handle h, const QString& istring)
  * the code that considers the alternate sources.
  */
 String
-mkshort_from_wpt(short_handle h, const waypoint* wpt)
+mkshort_from_wpt(short_handle h, const Waypoint* wpt)
 {
   /* This probably came from a Groundspeak Pocket Query
    * so use the 'cache name' instead of the description field
index 4a0eb4ce6e12b68412e0acb62860de26680a41ed..c71d82c43579dbc1f237e22bf6aa015f0c84fb19 100644 (file)
@@ -317,14 +317,14 @@ mmo_get_object(const uint16_t objid)
   return objects.value(key);
 }
 
-static waypoint*
+static Waypoint*
 mmo_get_waypt(mmo_data_t* data)
 {
   data->refct++;
   if (data->refct == 1) {
-    return (waypoint*)data->data;
+    return (Waypoint*)data->data;
   } else {
-    return new waypoint(*(waypoint*)data->data);
+    return new Waypoint(*(Waypoint*)data->data);
   }
 }
 
@@ -335,7 +335,7 @@ mmo_free_object(mmo_data_t* data)
     xfree(data->name);
   }
   if ((data->type == wptdata) && (data->refct == 0)) {
-    delete (waypoint*)data->data;
+    delete (Waypoint*)data->data;
   }
   xfree(data);
 }
@@ -448,7 +448,7 @@ mmo_read_CObjWaypoint(mmo_data_t* data)
 #ifdef MMO_DBG
   const char* sobj = "CObjWaypoint";
 #endif
-  waypoint* wpt;
+  Waypoint* wpt;
   time_t time;
   int rtelinks;
   mmo_data_t** rtelink = NULL;
@@ -460,7 +460,7 @@ mmo_read_CObjWaypoint(mmo_data_t* data)
   DBG((sobj, "name = \"%s\" [ visible=%s, id=0x%04X ]\n",
        data->name, data->visible ? "yes" : "NO", data->objid));
 
-  data->data = wpt = new waypoint;
+  data->data = wpt = new Waypoint;
   wpt->shortname = QString::fromLatin1(data->name);
 
   time = data->mtime;
@@ -630,12 +630,12 @@ mmo_read_CObjRoute(mmo_data_t* data)
     DBG((sobj, "read next waypoint\n"));
     tmp = mmo_read_object();
     if (tmp && tmp->data && (tmp->type = wptdata)) {
-      waypoint* wpt;
+      Waypoint* wpt;
 
       /* FIXME: At this point this waypoint maybe not fully loaded (initialized) !!!
          We need a final procedure to handle this !!! */
       if (! tmp->loaded) {
-        wpt = new waypoint;
+        wpt = new Waypoint;
         wpt->latitude = 0;
         wpt->longitude = 0;
         xasprintf(&wpt->shortname, "\01%p", tmp);
@@ -687,10 +687,10 @@ mmo_read_CObjTrack(mmo_data_t* data)
   DBG((sobj, "track has %d point(s)\n", tp));
 
   for (ctp = 0; ctp < tp; ctp++) {
-    waypoint* wpt;
+    Waypoint* wpt;
     char unk;
 
-    wpt = new waypoint;
+    wpt = new Waypoint;
 
     wpt->latitude = gbfgetdbl(fin);
     wpt->longitude = gbfgetdbl(fin);
@@ -961,20 +961,20 @@ mmo_read_object(void)
 }
 
 static void
-mmo_finalize_rtept_cb(const waypoint* wptref)
+mmo_finalize_rtept_cb(const Waypoint* wptref)
 {
-  waypoint* wpt = (waypoint*)wptref;
+  Waypoint* wpt = (Waypoint*)wptref;
 
   if ((wpt->shortname[0] == 1) && (wpt->latitude == 0) && (wpt->longitude == 0)) {
     mmo_data_t* data;
-    waypoint* wpt2;
+    Waypoint* wpt2;
 #if NEW_STRINGS
 #warning this code is on drugs.
     abort();
 #else
     sscanf(wpt->shortname + 1, "%p", &data);
 #endif
-    wpt2 = (waypoint*)data->data;
+    wpt2 = (Waypoint*)data->data;
 
     wpt->latitude = wpt2->latitude;
     wpt->longitude = wpt2->longitude;
@@ -1145,7 +1145,7 @@ mmo_writestr(const char* str)
 
 
 static void
-mmo_enum_waypt_cb(const waypoint* wpt)
+mmo_enum_waypt_cb(const Waypoint* wpt)
 {
   mmo_obj_ct++;
 }
@@ -1228,7 +1228,7 @@ mmo_write_obj_head(const char* sobj, const char* name, const time_t ctime,
 
 
 static void
-mmo_write_wpt_cb(const waypoint* wpt)
+mmo_write_wpt_cb(const Waypoint* wpt)
 {
   char* str; 
   String cx;
@@ -1349,7 +1349,7 @@ mmo_write_rte_head_cb(const route_head* rte)
   mmo_rte = (route_head*)rte;
 
   QUEUE_FOR_EACH(&rte->waypoint_list, elem, tmp) {
-    waypoint* wpt = (waypoint*)elem;
+    Waypoint* wpt = (Waypoint*)elem;
     QDateTime t = wpt->GetCreationTime();
     if ((t.isValid()) && (t.toTime_t() < time)) {
       time = t.toTime_t();
@@ -1398,7 +1398,7 @@ mmo_write_rte_tail_cb(const route_head* rte)
   }
 
   QUEUE_FOR_EACH(&rte->waypoint_list, elem, tmp) {
-    waypoint* wpt = (waypoint*)elem;
+    Waypoint* wpt = (Waypoint*)elem;
     int objid = mmo_get_objid(wpt);
     gbfputuint16(objid & 0x7FFF, fout);
   }
index a04ec73db7184c7bebac3f061954e9a23dd0fce3..299fbfa92965f30f7ce4966e71e1b398728b5691 100644 (file)
@@ -348,8 +348,8 @@ process_pmtklox()
   int wordnum;
   int bytenum;
   int fixnum;
-  static waypoint* trkpt;
-  static waypoint* waypt;
+  static Waypoint* trkpt;
+  static Waypoint* waypt;
 
   token = strtok(line, ",");
   if ((token == NULL) || (strcmp(token, "$PMTKLOX") != 0)) {
@@ -436,7 +436,7 @@ process_pmtklox()
     }
 
     if (global_opts.masked_objective & TRKDATAMASK) {
-      trkpt  = new waypoint;
+      trkpt  = new Waypoint;
       trkpt->SetCreationTime(timestamp);
       trkpt->latitude = latitude;
       trkpt->longitude = longitude;
@@ -448,7 +448,7 @@ process_pmtklox()
     }
 
     if (global_opts.masked_objective & WPTDATAMASK) {
-      waypt  = new waypoint;
+      waypt  = new Waypoint;
       waypt->SetCreationTime(timestamp);
       waypt->latitude = latitude;
       waypt->longitude = longitude;
index a70713b49ddf707bd9c15605d97b698d12f37053..573ab8b0bf6f9de1a3c2ad740d6b8a08d8433a15 100644 (file)
@@ -747,7 +747,7 @@ mtk_retry:
 static route_head*  trk_head = NULL;
 static int add_trackpoint(int idx, unsigned long bmask, struct data_item* itm)
 {
-  waypoint* trk = new waypoint;
+  Waypoint* trk = new Waypoint;
 
   if (global_opts.masked_objective& TRKDATAMASK && (trk_head == NULL || (mtk_info.track_event & MTK_EVT_START))) {
     char spds[50];
@@ -842,7 +842,7 @@ static int add_trackpoint(int idx, unsigned long bmask, struct data_item* itm)
          )
      ) {
     /* Button press -- create waypoint, start count at 1 */
-    waypoint* w = new waypoint(*trk);
+    Waypoint* w = new Waypoint(*trk);
 
     w->shortname = QString().sprintf("WP%06d", waypt_count()+1);
     waypt_add(w);
index 61a32756961430dc52b5b07200a8a04b4c98f1e9..6ff5c4dd6cb556aad6c7841a4ebcd05bda6f198d 100644 (file)
@@ -100,7 +100,7 @@ static void
 NaviReadCache(const QXmlStreamReader& reader)
 {
   const QXmlStreamAttributes a = reader.attributes();
-  waypoint* wpt_tmp = new waypoint;
+  Waypoint* wpt_tmp = new Waypoint;
   geocache_data* gc_data;
   gc_data = wpt_tmp->AllocGCData();
   if (a.hasAttribute("cache_id")) {
index 7352f17517003eb0f4647fe24d074693e19e4297..f78b0ef4b49725102c2863223c969328906a1701 100644 (file)
@@ -113,7 +113,7 @@ arglist_t ng_args[] = {
 /*===================Utilities ==========================================*/
 
 static void
-ng_convert_datum(waypoint* wpt)
+ng_convert_datum(Waypoint* wpt)
 {
   double lat, lon, east, north, alt;
 
@@ -237,7 +237,7 @@ ng_fill_waypoint_default(void)
 
 
 static void
-ng_waypt_rd(const waypoint* wpt)
+ng_waypt_rd(const Waypoint* wpt)
 {
   char z[50];
   double lat, lon;
@@ -383,7 +383,7 @@ data_read(void)
 
   for (int n = 0; n < nof_wp; ++n) {
 
-    waypoint* wpt_tmp = new waypoint;
+    Waypoint* wpt_tmp = new Waypoint;
 
     /* Read waypoint data */
 
index 34497ddf689ff1fc15f5342d4742193e0ba26432..3ff7c2000ef5aef977ece1b9c06219c52909aa71 100644 (file)
@@ -43,7 +43,7 @@ static unsigned char* track_data;
 static unsigned char* track_data_ptr;
 static unsigned char* track_data_end;
 static unsigned track_serial;
-static waypoint** route_waypts;
+static Waypoint** route_waypts;
 static unsigned* route_ids;
 static unsigned route_id_ptr;
 
@@ -165,12 +165,12 @@ arglist_t navilink_args[] = {
   ARG_TERMINATOR
 };
 
-static void (*write_waypoint)(const waypoint*) = NULL;
+static void (*write_waypoint)(const Waypoint*) = NULL;
 static void (*write_track_start)(const route_head* track) = NULL;
-static void (*write_track_point)(const waypoint* waypt) = NULL;
+static void (*write_track_point)(const Waypoint* waypt) = NULL;
 static void (*write_track_end)(const route_head* track) = NULL;
 static void (*write_route_start)(const route_head* track) = NULL;
-static void (*write_route_point)(const waypoint* waypt) = NULL;
+static void (*write_route_point)(const Waypoint* waypt) = NULL;
 static void (*write_route_end)(const route_head* track) = NULL;
 
 static int
@@ -188,9 +188,9 @@ find_icon_from_descr(const QString& descr)
 }
 
 static void
-free_waypoints(waypoint** waypts)
+free_waypoints(Waypoint** waypts)
 {
-  waypoint** wayptp;
+  Waypoint** wayptp;
 
   for (wayptp = waypts; wayptp < waypts + MAX_WAYPOINTS; wayptp++) {
     if (*wayptp) {
@@ -202,7 +202,7 @@ free_waypoints(waypoint** waypts)
 }
 
 static unsigned
-compare_waypoints(const waypoint* waypt1, const waypoint* waypt2)
+compare_waypoints(const Waypoint* waypt1, const Waypoint* waypt2)
 {
   return waypt1->latitude == waypt2->latitude &&
          waypt1->longitude == waypt2->longitude &&
@@ -380,7 +380,7 @@ encode_datetime(time_t datetime, unsigned char* buffer)
 }
 
 static void
-decode_position(const unsigned char* buffer, waypoint* waypt)
+decode_position(const unsigned char* buffer, Waypoint* waypt)
 {
   waypt->latitude = le_read32(buffer + 0) / 10000000.0;
   waypt->longitude = le_read32(buffer + 4) / 10000000.0;
@@ -388,7 +388,7 @@ decode_position(const unsigned char* buffer, waypoint* waypt)
 }
 
 static void
-encode_position(const waypoint* waypt, unsigned char* buffer)
+encode_position(const Waypoint* waypt, unsigned char* buffer)
 {
   le_write32(buffer + 0, (int)(waypt->latitude * 10000000));
   le_write32(buffer + 4, (int)(waypt->longitude * 10000000));
@@ -407,10 +407,10 @@ decode_waypoint_id(const unsigned char* buffer)
   return id;
 }
 
-static waypoint*
+static Waypoint*
 decode_waypoint(const unsigned char* buffer)
 {
-  waypoint* waypt = new waypoint;
+  Waypoint* waypt = new Waypoint;
 
   decode_position(buffer + 12, waypt);
   char* s = xstrdup((char*)buffer + 4);
@@ -423,7 +423,7 @@ decode_waypoint(const unsigned char* buffer)
 }
 
 static void
-encode_waypoint(const waypoint* waypt, unsigned char* buffer)
+encode_waypoint(const Waypoint* waypt, unsigned char* buffer)
 {
   buffer[0] = 0x00;
   buffer[1] = 0x40;
@@ -439,10 +439,10 @@ encode_waypoint(const waypoint* waypt, unsigned char* buffer)
   buffer[31] = 0x7e;
 }
 
-static waypoint*
+static Waypoint*
 decode_trackpoint(const unsigned char* buffer)
 {
-  waypoint* waypt = new waypoint;
+  Waypoint* waypt = new Waypoint;
 
   decode_position(buffer + 12, waypt);
   waypt->SetCreationTime(decode_datetime(buffer + 22));
@@ -453,7 +453,7 @@ decode_trackpoint(const unsigned char* buffer)
 }
 
 static void
-encode_trackpoint(const waypoint* waypt, unsigned serial, unsigned char* buffer)
+encode_trackpoint(const Waypoint* waypt, unsigned serial, unsigned char* buffer)
 {
   double x;
   double y;
@@ -474,16 +474,16 @@ encode_trackpoint(const waypoint* waypt, unsigned serial, unsigned char* buffer)
   buffer[31] = 0x7e;
 }
 
-static waypoint**
+static Waypoint**
 serial_read_waypoints(void)
 {
-  waypoint**       waypts = NULL;
+  Waypoint**       waypts = NULL;
   unsigned char  information[32];
   unsigned short total;
   unsigned short start;
 
   if (global_opts.masked_objective & RTEDATAMASK) {
-    waypts = (waypoint**) xcalloc(MAX_WAYPOINTS, sizeof(waypoint*));
+    waypts = (Waypoint**) xcalloc(MAX_WAYPOINTS, sizeof(Waypoint*));
   }
 
   write_packet(PID_QRY_INFORMATION, NULL, 0);
@@ -533,7 +533,7 @@ serial_read_waypoints(void)
 }
 
 static unsigned int
-serial_write_waypoint_packet(const waypoint* waypt)
+serial_write_waypoint_packet(const Waypoint* waypt)
 {
   unsigned char data[32];
   unsigned char id[2];
@@ -548,7 +548,7 @@ serial_write_waypoint_packet(const waypoint* waypt)
 }
 
 static void
-serial_write_waypoint(const waypoint* waypt)
+serial_write_waypoint(const Waypoint* waypt)
 {
   serial_write_waypoint_packet(waypt);
 }
@@ -637,7 +637,7 @@ serial_write_track_start(const route_head* track)
 }
 
 static void
-serial_write_track_point(const waypoint* waypt)
+serial_write_track_point(const Waypoint* waypt)
 {
   if (track_data_ptr >= track_data_end) {
     serial_write_track();
@@ -659,7 +659,7 @@ serial_write_track_end(const route_head* track)
 }
 
 static void
-serial_read_routes(waypoint** waypts)
+serial_read_routes(Waypoint** waypts)
 {
   unsigned char information[32];
   unsigned char routec;
@@ -704,7 +704,7 @@ serial_read_routes(waypoint** waypts)
         } else if (waypts[id] == NULL) {
           fatal(MYNAME ": Non-existent waypoint in route\n");
         } else {
-          route_add_wpt(route, new waypoint(*waypts[id]));
+          route_add_wpt(route, new Waypoint(*waypts[id]));
         }
       }
     }
@@ -719,7 +719,7 @@ serial_write_route_start(const route_head* route)
 }
 
 static void
-serial_write_route_point(const waypoint* waypt)
+serial_write_route_point(const Waypoint* waypt)
 {
   unsigned w;
 
@@ -731,7 +731,7 @@ serial_write_route_point(const waypoint* waypt)
 
   if (w == MAX_WAYPOINTS) {
     w = serial_write_waypoint_packet(waypt);
-    route_waypts[w] = new waypoint(*waypt);
+    route_waypts[w] = new Waypoint(*waypt);
   }
 
   route_ids[route_id_ptr++] = w;
@@ -839,18 +839,18 @@ decode_sbp_datetime_packed(const unsigned char* buffer)
 }
 
 static void
-decode_sbp_position(const unsigned char* buffer, waypoint* waypt)
+decode_sbp_position(const unsigned char* buffer, Waypoint* waypt)
 {
   waypt->latitude = le_read32(buffer + 0) / 10000000.0;
   waypt->longitude = le_read32(buffer + 4) / 10000000.0;
   waypt->altitude = le_read32(buffer + 8) / 100.0;
 }
 
-waypoint*
+Waypoint*
 navilink_decode_logpoint(const unsigned char* buffer)
 {
-  waypoint* waypt = NULL;
-  waypt = new waypoint;
+  Waypoint* waypt = NULL;
+  waypt = new Waypoint;
 
   waypt->hdop = ((unsigned char)buffer[0]) * 0.2f;
   waypt->sat = buffer[1];
@@ -996,7 +996,7 @@ file_read(void)
 }
 
 static void
-file_write_waypoint(const waypoint* waypt)
+file_write_waypoint(const Waypoint* waypt)
 {
   unsigned char data[32];
 
@@ -1011,7 +1011,7 @@ file_write_track_start(const route_head* track)
 }
 
 static void
-file_write_track_point(const waypoint* waypt)
+file_write_track_point(const Waypoint* waypt)
 {
   unsigned char data[32];
 
@@ -1031,7 +1031,7 @@ file_write_route_start(const route_head* track)
 }
 
 static void
-file_write_route_point(const waypoint* waypt)
+file_write_route_point(const Waypoint* waypt)
 {
 }
 
@@ -1186,7 +1186,7 @@ navilink_read(void)
     }
   } else {
     if (serial_handle) {
-      waypoint** waypts = NULL;
+      Waypoint** waypts = NULL;
 
       if (global_opts.masked_objective & (WPTDATAMASK|RTEDATAMASK)) {
         waypts = serial_read_waypoints();
index c985f0528bc9e610c950d1b6686de3fd6e88b9f6..05ef375bbdac58332d7943a8c02ca83e0914c9d0 100644 (file)
@@ -29,7 +29,7 @@
 #define SBP_RECORD_LEN 32
 
 /* defined in navilink.c */
-waypoint* navilink_decode_logpoint(const unsigned char* buffer);
+Waypoint* navilink_decode_logpoint(const unsigned char* buffer);
 unsigned navilink_checksum_packet(const unsigned char* packet, unsigned length);
 
 /* defined in sbn.c */
index 80e03a79fd4177a44ed6335b0a5594fec8b2ea93..2d452c1def04002d6060b35e5089a73a773b1511 100644 (file)
@@ -57,12 +57,12 @@ navitel_read_track(void)
 
   for (i = 0; i < points; i++) {
     int lat, lon;
-    waypoint* wpt;
+    Waypoint* wpt;
 
     lon = gbfgetint32(fin);
     lat = gbfgetint32(fin);
 
-    wpt = new waypoint;
+    wpt = new Waypoint;
     wpt->latitude = GPS_Math_Semi_To_Deg(lat & 0x7FFFFFFF);
     wpt->longitude = GPS_Math_Semi_To_Deg(lon);
 
@@ -87,7 +87,7 @@ navitel_wr_deinit(void)
 }
 
 static void
-navitel_enum_trkpts(const waypoint* wpt)
+navitel_enum_trkpts(const Waypoint* wpt)
 {
   trkpts++;
 }
@@ -99,7 +99,7 @@ navitel_disp_trk_head(const route_head* trk)
 }
 
 static void
-navitel_disp_trkpts(const waypoint* wpt)
+navitel_disp_trkpts(const Waypoint* wpt)
 {
   int lat, lon;
 
index 5c07feccc51c683fba90ba4b85abcdcdbebf2921..330667cc8ad8c58374af67e9e82ebd93b184ce8a 100644 (file)
@@ -82,7 +82,7 @@ data_read(void)
   char mac[2 + 17 + 2 + 1];                    /* "( " + MAC + " )" + null */
   char desc[sizeof ssid - 1 + 15 + 1]; /* room for channel/speed */
   double lat = 0, lon = 0;
-  waypoint* wpt_tmp;
+  Waypoint* wpt_tmp;
   int line_no = 0;
   int stealth_num = 0, whitespace_num = 0;
   long flags = 0;
@@ -209,7 +209,7 @@ data_read(void)
       continue;
     }
 
-    wpt_tmp = new waypoint;
+    wpt_tmp = new Waypoint;
 
     if (stealth) {
       if (!snmac) {
@@ -249,7 +249,7 @@ data_read(void)
 
 typedef struct {
   unsigned long crc;
-  waypoint* wpt;
+  Waypoint* wpt;
 } htable_t;
 
 static
@@ -274,8 +274,8 @@ compare(const void* a, const void* b)
      * to make the testo script happy.
      * */
 
-    waypoint* wpt_a = ((const htable_t*)a)->wpt;
-    waypoint* wpt_b = ((const htable_t*)b)->wpt;
+    Waypoint* wpt_a = ((const htable_t*)a)->wpt;
+    Waypoint* wpt_b = ((const htable_t*)b)->wpt;
 #if NEW_STRINGS
     return wpt_a->description.compare(wpt_b->description);
 #else
@@ -304,14 +304,14 @@ fix_netstumbler_dupes(void)
 #if NEWQ
   // Why, oh, why is this format running over the entire waypoint list and
   // modifying it?  This seems wrong.
-  extern QList<waypoint*> waypt_list;
-  foreach(waypoint* waypointp, waypt_list) {
+  extern QList<Waypoint*> waypt_list;
+  foreach(Waypoint* waypointp, waypt_list) {
     bh->wpt = waypointp;
 #else
   queue* elem, *tmp;
   extern queue waypt_head;
   QUEUE_FOR_EACH(&waypt_head, elem, tmp) {
-    bh->wpt = (waypoint*) elem;
+    bh->wpt = (Waypoint*) elem;
 #endif
     QString snptr = bh->wpt->shortname;
     QString tmp_sn = snptr.toLower();
index 588e38553cc6c4ca719be5266c2f01e2355d5b9a..380ad31ee873d296806322b1c9be5ad5215e5590 100644 (file)
@@ -153,8 +153,8 @@ static route_head* trk_head;
 static short_handle mkshort_handle;
 static preferred_posn_type posn_type;
 static struct tm tm;
-static waypoint* curr_waypt;
-static waypoint* last_waypt;
+static Waypoint* curr_waypt;
+static Waypoint* last_waypt;
 static void* gbser_handle;
 static const char* posn_fname;
 static queue pcmpt_head;
@@ -187,7 +187,7 @@ static double last_read_time;   /* Last timestamp of GGA or PRMC */
 static int datum;
 static int had_checksum;
 
-static waypoint* nmea_rd_posn(posn_status*);
+static Waypoint* nmea_rd_posn(posn_status*);
 static void nmea_rd_posn_init(const char* fname);
 
 arglist_t nmea_args[] = {
@@ -227,7 +227,7 @@ nmea_cksum(const char* const buf)
 }
 
 static void
-nmea_add_wpt(waypoint* wpt, route_head* trk)
+nmea_add_wpt(Waypoint* wpt, route_head* trk)
 {
   if (datum != DATUM_WGS84) {
     double lat, lon, alt;
@@ -245,7 +245,7 @@ nmea_add_wpt(waypoint* wpt, route_head* trk)
 }
 
 static void
-nmea_release_wpt(waypoint* wpt)
+nmea_release_wpt(Waypoint* wpt)
 {
   if (wpt && ((wpt->Q.next == NULL) || (wpt->Q.next == &wpt->Q))) {
     /* This waypoint isn't queued.
@@ -280,7 +280,7 @@ nmea_rd_init(const char* fname)
    * it as one waypoint.
    */
   if (getposn) {
-    waypoint* wpt;
+    Waypoint* wpt;
     posn_status st;
     nmea_rd_posn_init(fname);
     wpt = nmea_rd_posn(&st);
@@ -353,7 +353,7 @@ nmea_wr_deinit(void)
 }
 
 static void
-nmea_set_waypoint_time(waypoint* wpt, struct tm* time, double fsec)
+nmea_set_waypoint_time(Waypoint* wpt, struct tm* time, double fsec)
 {
   if (time->tm_year == 0) {
     wpt->SetCreationTime(((((time_t)time->tm_hour * 60) + time->tm_min) * 60) + time->tm_sec, lround(1000.0 * fsec));
@@ -379,7 +379,7 @@ gpgll_parse(char* ibuf)
   double hmsd;
   int hms;
   char valid = 0;
-  waypoint* waypt;
+  Waypoint* waypt;
 
   if (trk_head == NULL) {
     trk_head = route_head_alloc();
@@ -405,7 +405,7 @@ gpgll_parse(char* ibuf)
   hms = hms / 100;
   tm.tm_hour = hms % 100;
 
-  waypt = new waypoint;
+  waypt = new Waypoint;
 
   nmea_set_waypoint_time(waypt, &tm, fsec);
 
@@ -434,7 +434,7 @@ gpgga_parse(char* ibuf)
   int nsats = 0;
   double hdop;
   char altunits;
-  waypoint* waypt;
+  Waypoint* waypt;
   double fsec;
 
   if (trk_head == NULL) {
@@ -466,7 +466,7 @@ gpgga_parse(char* ibuf)
   hms = hms / 100;
   tm.tm_hour = (long) hms % 100;
 
-  waypt  = new waypoint;
+  waypt  = new Waypoint;
 
   nmea_set_waypoint_time(waypt, &tm, fsec);
 
@@ -514,7 +514,7 @@ gprmc_parse(char* ibuf)
   char fix;
   unsigned int dmy;
   double speed,course;
-  waypoint* waypt;
+  Waypoint* waypt;
   double fsec;
   char* dmybuf;
   int i;
@@ -581,13 +581,13 @@ gprmc_parse(char* ibuf)
     }
     /* This point is both a waypoint and a trackpoint. */
     if (amod_waypoint) {
-      waypt_add(new waypoint(*curr_waypt));
+      waypt_add(new Waypoint(*curr_waypt));
       amod_waypoint = 0;
     }
     return;
   }
 
-  waypt  = new waypoint;
+  waypt  = new Waypoint;
 
   WAYPT_SET(waypt, speed, KNOTS_TO_MPS(speed));
 
@@ -610,7 +610,7 @@ gprmc_parse(char* ibuf)
 
   /* This point is both a waypoint and a trackpoint. */
   if (amod_waypoint) {
-    waypt_add(new waypoint(*waypt));
+    waypt_add(new Waypoint(*waypt));
     amod_waypoint = 0;
   }
 }
@@ -618,7 +618,7 @@ gprmc_parse(char* ibuf)
 static void
 gpwpl_parse(char* ibuf)
 {
-  waypoint* waypt;
+  Waypoint* waypt;
   double latdeg, lngdeg;
   char latdir, lngdir;
   char sname[99];
@@ -628,7 +628,7 @@ gpwpl_parse(char* ibuf)
          &lngdeg,&lngdir,
          sname);
 
-  waypt  = new waypoint;
+  waypt  = new Waypoint;
 
   if (latdir == 'S') {
     latdeg = -latdeg;
@@ -800,7 +800,7 @@ pcmpt_parse(char* ibuf)
   }
 
   if (lat || lon) {
-    curr_waypt = new waypoint;
+    curr_waypt = new Waypoint;
     curr_waypt->longitude = pcmpt_deg(lon);
     curr_waypt->latitude = pcmpt_deg(lat);
 
@@ -833,7 +833,7 @@ pcmpt_parse(char* ibuf)
     trk_head = route_head_alloc();
     track_add_head(trk_head);
     QUEUE_FOR_EACH(&pcmpt_head, elem, tmp) {
-      waypoint* wpt = (waypoint*) dequeue(elem);
+      Waypoint* wpt = (Waypoint*) dequeue(elem);
       nmea_add_wpt(wpt, trk_head);
     }
   }
@@ -848,7 +848,7 @@ nmea_fix_timestamps(route_head* track)
 
   if (tm.tm_year == 0) {
     queue* elem, *temp;
-    waypoint* prev = NULL;
+    Waypoint* prev = NULL;
     time_t delta_tm;
 
     if (optdate == NULL) {
@@ -860,7 +860,7 @@ nmea_fix_timestamps(route_head* track)
     delta_tm = mkgmtime(&opt_tm);
 
     QUEUE_FOR_EACH(&track->waypoint_list, elem, temp) {
-      waypoint* wpt = (waypoint*)elem;
+      Waypoint* wpt = (Waypoint*)elem;
 
       wpt->creation_time += delta_tm;
       if ((prev != NULL) && (prev->creation_time > wpt->creation_time)) {      /* go over midnight ? */
@@ -882,7 +882,7 @@ nmea_fix_timestamps(route_head* track)
     /* go backward through the track and complete timestamps */
 
     for (elem = QUEUE_LAST(&track->waypoint_list); elem != &track->waypoint_list; elem=elem->prev) {
-      waypoint* wpt = (waypoint*)elem;
+      Waypoint* wpt = (Waypoint*)elem;
 
       if (wpt->wpt_flags.fmt_use != 0) {
         time_t dt;
@@ -1162,7 +1162,7 @@ int hunt_sirf(void)
   return 0;
 }
 
-static waypoint*
+static Waypoint*
 nmea_rd_posn(posn_status* posn_status)
 {
   char ibuf[1024];
@@ -1204,7 +1204,7 @@ nmea_rd_posn(posn_status* posn_status)
     nmea_parse_one_line(ibuf);
     if (lt != last_read_time) {
       if (last_read_time) {
-        waypoint* w = curr_waypt;
+        Waypoint* w = curr_waypt;
 
         lt = last_read_time;
         curr_waypt = NULL;
@@ -1217,7 +1217,7 @@ nmea_rd_posn(posn_status* posn_status)
 }
 
 static void
-nmea_wayptpr(const waypoint* wpt)
+nmea_wayptpr(const Waypoint* wpt)
 {
   char obuf[200];
   double lat,lon;
@@ -1257,7 +1257,7 @@ nmea_track_init(const route_head* rte)
 }
 
 void
-nmea_trackpt_pr(const waypoint* wpt)
+nmea_trackpt_pr(const Waypoint* wpt)
 {
   char obuf[200];
   char fix='0';
@@ -1390,7 +1390,7 @@ nmea_wr_posn_init(const char* fname)
 }
 
 static void
-nmea_wr_posn(waypoint* wpt)
+nmea_wr_posn(Waypoint* wpt)
 {
   nmea_trackpt_pr(wpt);
 }
index 0d8afc53c841f5b52e20227d203b2c5e9e66118f..cc9f4fd748b3fd20ca659684c254d3af91baa017 100644 (file)
@@ -104,7 +104,7 @@ nmn4_read_data(void)
 
   QString zip1, zip2, city, street, number;
   route_head* route;
-  waypoint* wpt;
+  Waypoint* wpt;
 
   route = route_head_alloc();
   route_add_head(route);
@@ -123,7 +123,7 @@ nmn4_read_data(void)
     /* for a quiet compiler */
     zip1 = zip2 = city = street = number = QString();
 
-    wpt = new waypoint;
+    wpt = new Waypoint;
 
     column = -1;
     c = csv_lineparse(str, "|", "", column++);
@@ -229,7 +229,7 @@ nmn4_route_tlr(const route_head* rte)
 }
 
 static void
-nmn4_write_waypt(const waypoint* wpt)
+nmn4_write_waypt(const Waypoint* wpt)
 {
   char city[128], street[128], zipc[32], number[32];
 
index b7c1618811326fb5c2bbecd9ea8304d43d7dc402..5e7ff247f51f0f03fdf478dd7d001777e098e7ac 100644 (file)
@@ -36,7 +36,7 @@ static arglist_t osm_args[] = {
 
 #define MYNAME "osm"
 
-static QHash<QString, const waypoint*> waypoints;
+static QHash<QString, const Waypoint*> waypoints;
 
 static QHash<QString, int> keys;
 static QHash<QString, const struct osm_icon_mapping_s*> values;
@@ -47,7 +47,7 @@ static int node_id;
 static int skip_rte;
 
 static route_head* rte;
-static waypoint* wpt;
+static Waypoint* wpt;
 
 static xg_callback     osm_node, osm_node_tag, osm_node_end;
 static xg_callback     osm_way, osm_way_nd, osm_way_tag, osm_way_end;
@@ -482,7 +482,7 @@ osm_node_end(xg_string args, const QXmlStreamAttributes* unused)
 static void
 osm_node(xg_string args, const QXmlStreamAttributes* attrv)
 {
-  wpt = new waypoint;
+  wpt = new Waypoint;
 
   if (attrv->hasAttribute("id")) {
     QString atstr = attrv->value("id").toString();
@@ -592,12 +592,12 @@ osm_way_nd(xg_string args, const QXmlStreamAttributes* attrv)
 {
   if (attrv->hasAttribute("ref")) {
     QString atstr = attrv->value("ref").toString();
-    waypoint* tmp;
-    const waypoint* ctmp;
+    Waypoint* tmp;
+    const Waypoint* ctmp;
 
     if (waypoints.contains(atstr)) {
       ctmp = waypoints.value(atstr);
-      tmp = new waypoint(*ctmp);
+      tmp = new Waypoint(*ctmp);
       route_add_wpt(rte, tmp);
     } else {
       warning(MYNAME ": Way reference id \"%s\" wasn't listed under nodes!\n", CSTR(atstr));
@@ -700,7 +700,7 @@ osm_write_tag(const QString& key, const QString& value)
 }
 
 static void
-osm_disp_feature(const waypoint* wpt)
+osm_disp_feature(const Waypoint* wpt)
 {
   const osm_icon_mapping_t* map;
 
@@ -740,17 +740,17 @@ osm_write_opt_tag(const char* atag)
 }
 
 static void
-osm_release_ids(const waypoint* wpt)
+osm_release_ids(const Waypoint* wpt)
 {
   if (wpt && wpt->extra_data) {
-    waypoint* tmp = (waypoint*)wpt;
+    Waypoint* tmp = (Waypoint*)wpt;
     xfree(tmp->extra_data);
     tmp->extra_data = NULL;
   }
 }
 
 static QString
-osm_name_from_wpt(const waypoint* wpt)
+osm_name_from_wpt(const Waypoint* wpt)
 {
   QString name = QString("%1\01%2\01%3")
 #if NEW_STRINGS
@@ -764,7 +764,7 @@ osm_name_from_wpt(const waypoint* wpt)
 }
 
 static void
-osm_waypt_disp(const waypoint* wpt)
+osm_waypt_disp(const Waypoint* wpt)
 {
   QString name = osm_name_from_wpt(wpt);
 
@@ -778,7 +778,7 @@ osm_waypt_disp(const waypoint* wpt)
 
   id = (int*) xmalloc(sizeof(*id));
   *id = --node_id;
-  ((waypoint*)(wpt))->extra_data = id;
+  ((Waypoint*)(wpt))->extra_data = id;
 
   gbfprintf(fout, "  <node id='%d' visible='true' lat='%0.7f' lon='%0.7f'", *id, wpt->latitude, wpt->longitude);
   if (wpt->creation_time.isValid()) {
@@ -858,10 +858,10 @@ osm_rte_disp_head(const route_head* rte)
 }
 
 static void
-osm_rtept_disp(const waypoint* wpt_ref)
+osm_rtept_disp(const Waypoint* wpt_ref)
 {
   QString name = osm_name_from_wpt(wpt_ref);
-  const waypoint* wpt;
+  const Waypoint* wpt;
 
   if (skip_rte) {
     return;
index 4a70116d2853c202ad311ccc801a59f6a7016804..55e1ba01ecd155488450e26509ccfebb6942dfde 100644 (file)
@@ -249,7 +249,7 @@ static void ovl_read(void)
   int     keyw,i;
   double  rwert;
   route_head* route_head = NULL;
-  waypoint*   wpt;
+  Waypoint*   wpt;
   int      sym_cnt;
   int lineno = 0;
 
@@ -313,7 +313,7 @@ static void ovl_read(void)
             }
             break;
           case KEY_PUNKTE  :
-            isSection = SECTION_PUNKTE; // Linie, Fläche
+            isSection = SECTION_PUNKTE; // Linie, Flche
             break;
 #ifdef WITH_BITMAP
           case KEY_PATH     :
@@ -362,7 +362,7 @@ static void ovl_read(void)
             switch (aktTyp) {
 #ifdef WITH_BITMAP
             case 1: // Bitmap
-              wpt = new waypoint;
+              wpt = new Waypoint;
               wpt->latitude = aktY;
               wpt->longitude = aktX;
               wpt->altitude = 0.0;
@@ -374,13 +374,13 @@ static void ovl_read(void)
               isSection = SECTION_SYMBOL;
               break;
             case 3: // Linie
-              wpt = new waypoint;
+              wpt = new Waypoint;
               wpt->latitude = aktY;
               wpt->longitude = aktX;
               wpt->altitude = 0.0;
               route_add_wpt(route_head, wpt);
               break;
-            case 4: // Fläche
+            case 4: // Flche
               break;
             case 5: // Rechteck
               break;
@@ -503,7 +503,7 @@ static void ovl_wr_deinit(void)
     gbfprintf(fpout,"CenterLat=%.8lf\n",govl_sum_n/govl_sumcnt); // precision 8 = better than 1mm
     gbfprintf(fpout,"CenterLong=%.8lf\n",govl_sum_e/govl_sumcnt);
   } else {
-    gbfprintf(fpout,"CenterLong=10.52374295\n"); // Braunschweiger Löwe, Mittelpunkt der Welt :-)
+    gbfprintf(fpout,"CenterLong=10.52374295\n"); // Braunschweiger Lwe, Mittelpunkt der Welt :-)
     gbfprintf(fpout,"CenterLat=52.26474445\n");
   }
   gbfprintf(fpout,"RefOn=0\n");
@@ -543,7 +543,7 @@ static void symbol_text(double east,double north,const QString& text,int group)
   govl_symbol_cnt++;
 }
 
-static void symbol_point(const waypoint* wpt)
+static void symbol_point(const Waypoint* wpt)
 {
   double east,north;
 
@@ -565,7 +565,7 @@ static void symbol_point(const waypoint* wpt)
 static void symbol_deinit(const route_head* hd)
 {
   queue* elem, *tmp;
-  waypoint* waypointp;
+  Waypoint* waypointp;
   int i;
   double lat1,lon1,lat2,lon2;
   double lats,lons,late,lone;
@@ -576,7 +576,7 @@ static void symbol_deinit(const route_head* hd)
   dist = 0.0;
   i = 0;
   QUEUE_FOR_EACH(&(hd->waypoint_list), elem, tmp) {
-    waypointp = (waypoint*) elem;
+    waypointp = (Waypoint*) elem;
     lat2 = RAD(waypointp->latitude);
     lon2 = RAD(waypointp->longitude);
     if (i) {
@@ -596,7 +596,7 @@ static void symbol_deinit(const route_head* hd)
   i = 0;
   elem = QUEUE_FIRST(&(hd->waypoint_list));
   while (elem!=&(hd->waypoint_list) && dd<dist/2.0) {
-    waypointp = (waypoint*) elem;
+    waypointp = (Waypoint*) elem;
     lat2 = RAD(waypointp->latitude);
     lon2 = RAD(waypointp->longitude);
     if (i) {
@@ -627,7 +627,7 @@ static void symbol_deinit(const route_head* hd)
   govl_dir = 0.0; // restore
 }
 
-static void overlay_waypt_pr(const waypoint* waypointp)
+static void overlay_waypt_pr(const Waypoint* waypointp)
 {
   const char* oname;
 
index a95bc602a15e67a0bb296af4f69d0c33e351f106..79a7314ab89057698a86f8a8d065cddde3a8ef24 100644 (file)
@@ -148,7 +148,7 @@ ozi_alloc_fsdata(void)
 }
 
 void
-ozi_get_time_str(const waypoint* waypointp, char* buff, gbsize_t buffsz)
+ozi_get_time_str(const Waypoint* waypointp, char* buff, gbsize_t buffsz)
 {
   if (waypointp->creation_time.isValid()) {
     double time = (waypt_time(waypointp) / SECONDS_PER_DAY) + DAYS_SINCE_1990;
@@ -159,7 +159,7 @@ ozi_get_time_str(const waypoint* waypointp, char* buff, gbsize_t buffsz)
 }
 
 void
-ozi_set_time_str(const QString& str, waypoint* waypointp)
+ozi_set_time_str(const QString& str, Waypoint* waypointp)
 {
   double ozi_time = str.toDouble();
 
@@ -170,7 +170,7 @@ ozi_set_time_str(const QString& str, waypoint* waypointp)
 }
 
 static void
-ozi_convert_datum(waypoint* wpt)
+ozi_convert_datum(Waypoint* wpt)
 {
   if (datum != DATUM_WGS84) {
     double lat, lon, alt;
@@ -254,7 +254,7 @@ ozi_track_hdr(const route_head* rte)
 }
 
 static void
-ozi_track_disp(const waypoint* waypointp)
+ozi_track_disp(const Waypoint* waypointp)
 {
   double alt;
   char ozi_time[16];
@@ -321,7 +321,7 @@ ozi_route_hdr(const route_head* rte)
 }
 
 static void
-ozi_route_disp(const waypoint* waypointp)
+ozi_route_disp(const Waypoint* waypointp)
 {
   char ozi_time[16];
 
@@ -487,7 +487,7 @@ wr_deinit(void)
 }
 
 static void
-ozi_parse_waypt(int field, const QString& str, waypoint* wpt_tmp, ozi_fsdata* fsdata)
+ozi_parse_waypt(int field, const QString& str, Waypoint* wpt_tmp, ozi_fsdata* fsdata)
 {
   double alt;
 
@@ -582,7 +582,7 @@ ozi_parse_waypt(int field, const QString& str, waypoint* wpt_tmp, ozi_fsdata* fs
 }
 
 static void
-ozi_parse_track(int field, char* str, waypoint* wpt_tmp, char* trk_name)
+ozi_parse_track(int field, char* str, Waypoint* wpt_tmp, char* trk_name)
 {
   double alt;
 
@@ -628,7 +628,7 @@ ozi_parse_track(int field, char* str, waypoint* wpt_tmp, char* trk_name)
 }
 
 static void
-ozi_parse_routepoint(int field, char* str, waypoint* wpt_tmp)
+ozi_parse_routepoint(int field, char* str, Waypoint* wpt_tmp)
 {
   if (*str == '\0') {
     return;
@@ -688,7 +688,7 @@ ozi_parse_routepoint(int field, char* str, waypoint* wpt_tmp)
 }
 
 static void
-ozi_parse_routeheader(int field, const QString& str, waypoint* wpt_tmp)
+ozi_parse_routeheader(int field, const QString& str, Waypoint* wpt_tmp)
 {
 
   switch (field) {
@@ -722,7 +722,7 @@ data_read(void)
 {
   QString buff;
   char* trk_name = NULL;
-  waypoint* wpt_tmp;
+  Waypoint* wpt_tmp;
   int i;
   int linecount = 0;
 
@@ -779,7 +779,7 @@ data_read(void)
     if (buff.contains(',')) {
       bool ozi_fsdata_used = false;
       ozi_fsdata* fsdata = ozi_alloc_fsdata();
-      wpt_tmp = new waypoint;
+      wpt_tmp = new Waypoint;
 
       /* data delimited by commas, possibly enclosed in quotes.  */
       char* orig_s = xstrdup(CSTR(buff));
@@ -864,7 +864,7 @@ data_read(void)
 }
 
 static void
-ozi_waypt_pr(const waypoint* wpt)
+ozi_waypt_pr(const Waypoint* wpt)
 {
   static int index = 0;
   double alt;
index 5f9de4aac8ff6d420ec429b632055017b541b624..9152b43ccd91063e5620ad574ffb69e03768bbc5 100644 (file)
@@ -93,7 +93,7 @@ data_read(void)
   char date[10];
   char time[9];
   char month[4];
-  waypoint* wpt_tmp;
+  Waypoint* wpt_tmp;
   char* buff;
   struct tm tm;
   route_head* track = NULL;
@@ -153,7 +153,7 @@ data_read(void)
       name[sizeof(name)-1] = '\0';
       desc[sizeof(desc)-1] = '\0';
 
-      wpt_tmp = new waypoint;
+      wpt_tmp = new Waypoint;
       wpt_tmp->altitude = alt;
       cp = lrtrim(name);
       if (*cp != '\0') {
@@ -184,7 +184,7 @@ data_read(void)
         wpt_tmp->latitude = ddmm2degrees(lat);
       }
       if (route != NULL) {
-        route_add_wpt(route, new waypoint(*wpt_tmp));
+        route_add_wpt(route, new Waypoint(*wpt_tmp));
       }
       waypt_add(wpt_tmp);
       points++;
@@ -253,7 +253,7 @@ data_read(void)
       if (tm.tm_year < 70) {
         tm.tm_year += 100;
       }
-      wpt_tmp = new waypoint;
+      wpt_tmp = new Waypoint;
       wpt_tmp->SetCreationTime(mkgmtime(&tm));
       if (read_as_degrees) {
         wpt_tmp->longitude = lon;
@@ -316,7 +316,7 @@ data_read(void)
 }
 
 static void
-gpsutil_disp(const waypoint* wpt)
+gpsutil_disp(const Waypoint* wpt)
 {
   double lon,lat;
   int icon_token = 0;
@@ -394,7 +394,7 @@ pcx_route_hdr(const route_head* rte)
 }
 
 void
-pcx_track_disp(const waypoint* wpt)
+pcx_track_disp(const Waypoint* wpt)
 {
   double lon,lat;
   char tbuf[100];
index aeaf9ee54f6dcc388276f8a5b39748a77471f308..5fef6d9da342e7927752dc3550334c01b3e273af 100644 (file)
@@ -90,7 +90,7 @@ read_tracks(void)
 
   while (1 == gbfread(&bc, sizeof(bc), 1, file_in)) {
     struct tm tm;
-    waypoint* wpt;
+    Waypoint* wpt;
 
     if (strcmp(bc.id, header_id) != 0) {
       fatal(MYNAME ": invalid breadcrumb header in input file.\n");
@@ -104,7 +104,7 @@ read_tracks(void)
     tm.tm_min = le_readu16(&bc.minute);
     tm.tm_sec = le_readu16(&bc.second);
 
-    wpt = new waypoint;
+    wpt = new Waypoint;
     wpt->latitude = le_read_float(&bc.latitude);
     wpt->longitude = le_read_float(&bc.longitude);
     wpt->altitude = FEET_TO_METERS(le_read_float(&bc.altitude));
@@ -126,7 +126,7 @@ route_head_noop(const route_head* wp)
 }
 
 static void
-pocketfms_waypt_disp(const waypoint* wpt)
+pocketfms_waypt_disp(const Waypoint* wpt)
 {
   struct breadcrumb bc;
   struct tm* tm;
index f5eff59b56b06bc9a0c1f4df455cb5970872cd98..aa1c6a2e7cee1db4f1e3a04099689d145e7ebe73 100644 (file)
@@ -26,7 +26,7 @@
 
 static int isFirst = 1;
 static route_head* route = NULL;
-static waypoint* wpt_to, *wpt_from;
+static Waypoint* wpt_to, *wpt_from;
 static double dest_altitude;
 
 #define MYNAME "PocketFMS FlightPlan"
@@ -65,8 +65,8 @@ static void
 rd_deinit(void)
 {
   if (route != NULL) {
-    waypoint* head = (waypoint*) QUEUE_FIRST(&route->waypoint_list);
-    waypoint* tail = (waypoint*) QUEUE_LAST(&route->waypoint_list);
+    Waypoint* head = (Waypoint*) QUEUE_FIRST(&route->waypoint_list);
+    Waypoint* tail = (Waypoint*) QUEUE_LAST(&route->waypoint_list);
     if (head != NULL) {
       route->rte_name = head->shortname;
     }
@@ -88,12 +88,12 @@ wr_init(const char* fname)
 void   wpt_s(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (isFirst == 1) {
-    wpt_from = new waypoint;
+    wpt_from = new Waypoint;
     route = route_head_alloc();
     route->rte_desc="PocketFMS flightplan";
     route_add_head(route);
   }
-  wpt_to = new waypoint;
+  wpt_to = new Waypoint;
 }
 
 void   wpt_e(xg_string args, const QXmlStreamAttributes* unused)
@@ -101,14 +101,14 @@ void      wpt_e(xg_string args, const QXmlStreamAttributes* unused)
   if (isFirst == 1) {
     route_add_wpt(route, wpt_from);
     if (doing_wpts) {
-      waypt_add(new waypoint(*wpt_from));
+      waypt_add(new Waypoint(*wpt_from));
     }
     wpt_from = NULL;
     isFirst = 0;
   }
   route_add_wpt(route, wpt_to);
   if (doing_wpts) {
-    waypt_add(new waypoint(*wpt_to));
+    waypt_add(new Waypoint(*wpt_to));
   }
   wpt_to = NULL;
 }
index 656fe6ee6db1583e8e5b3706fcb7441e407903b2..fc60a27f0a044938806edfb7186b7a9d98eae22c 100644 (file)
@@ -59,13 +59,13 @@ data_read(void)
   int linecount = 0;
   while ((buff = gbfgetstr(file_in))) {
     char* s;
-    waypoint* wpt;
+    Waypoint* wpt;
     rtrim(buff);
     if (strlen(buff) == 0) {
       break;
     }
     linecount++;
-    wpt = new waypoint;
+    wpt = new Waypoint;
     s = buff;
     s = csv_lineparse(s, "\\w", "", linecount);
     if (!s) {
@@ -100,7 +100,7 @@ wr_init(const char* fname)
 }
 
 static void
-enigma_waypt_disp(const waypoint* wpt)
+enigma_waypt_disp(const Waypoint* wpt)
 {
   char* t;
 #if NEW_STRINGS
index c926ad14c9cf47ec6ff4ec199b70b5d3293aefa0..980d65df827c9b43c27560239d15452d87594582 100644 (file)
@@ -236,7 +236,7 @@ void
 polygon_process(void)
 {
   queue* elem, * tmp;
-  waypoint* waypointp;
+  Waypoint* waypointp;
   extra_data* ed;
   double lat1, lon1, lat2, lon2;
   double olat, olon;
@@ -270,10 +270,10 @@ polygon_process(void)
     } else if (lat1 != BADVAL && lon1 != BADVAL &&
                lat2 != BADVAL && lon2 != BADVAL) {
 #if NEWQ
-      foreach(waypoint* waypointp, waypt_list) {
+      foreach(Waypoint* waypointp, waypt_list) {
 #else
       QUEUE_FOR_EACH(&waypt_head, elem, tmp) {
-        waypointp = (waypoint*)elem;
+        waypointp = (Waypoint*)elem;
 #endif
         if (waypointp->extra_data) {
           ed = (extra_data*) waypointp->extra_data;
@@ -319,10 +319,10 @@ polygon_process(void)
   gbfclose(file_in);
 
 #if NEWQ
-  foreach(waypoint* wp, waypt_list) {
+  foreach(Waypoint* wp, waypt_list) {
 #else
   QUEUE_FOR_EACH(&waypt_head, elem, tmp) {
-    waypoint* wp = (waypoint*) elem;
+    Waypoint* wp = (Waypoint*) elem;
 #endif
     ed = (extra_data*) wp->extra_data;
     wp->extra_data = NULL;
index 28abf77f24e7c0c72322cf410877e5eef5b44cd2..db32f519b0425adf7974dddc3a255d459acf2c63 100644 (file)
@@ -77,16 +77,16 @@ static void
 position_runqueue(queue* q, int nelems, int qtype)
 {
   queue* elem, * tmp;
-  waypoint** comp;
+  Waypoint** comp;
   int* qlist;
   double dist, diff_time;
   int i = 0, j, anyitem;
 
-  comp = (waypoint**) xcalloc(nelems, sizeof(*comp));
+  comp = (Waypoint**) xcalloc(nelems, sizeof(*comp));
   qlist = (int*) xcalloc(nelems, sizeof(*qlist));
 
   QUEUE_FOR_EACH(q, elem, tmp) {
-    comp[i] = (waypoint*)elem;
+    comp[i] = (Waypoint*)elem;
     qlist[i] = 0;
     i++;
   }
@@ -173,7 +173,7 @@ position_process_route(const route_head* rh)
 }
 
 static void
-position_noop_w(const waypoint* w)
+position_noop_w(const Waypoint* w)
 {
 }
 
index ce52ffdcd00ab34732a4b8ab1090afa1a70cd92c..aa56215ff8962c2f4dc23c66a1ce87e44f7ed03f 100644 (file)
@@ -294,14 +294,14 @@ psit_isKnownToken(char* buf)
  * MRCB
  */
 static void
-psit_waypoint_r(gbfile* psit_file, waypoint** wpt)
+psit_waypoint_r(gbfile* psit_file, Waypoint** wpt)
 {
   int          garmin_icon_num;
 
-  waypoint*    thisWaypoint;
+  Waypoint*    thisWaypoint;
 
   if (strlen(psit_current_token) > 0) {
-    thisWaypoint = new waypoint;
+    thisWaypoint = new Waypoint;
 
     thisWaypoint->latitude = atof(psit_current_token);
 
@@ -339,7 +339,7 @@ psit_waypoint_r(gbfile* psit_file, waypoint** wpt)
  * MRCB
  */
 static void
-psit_waypoint_w(gbfile* psit_file, const waypoint* wpt)
+psit_waypoint_w(gbfile* psit_file, const Waypoint* wpt)
 {
   int  icon;
   const char* ident;
@@ -378,7 +378,7 @@ psit_waypoint_w(gbfile* psit_file, const waypoint* wpt)
 }
 
 static void
-psit_waypoint_w_wrapper(const waypoint* wpt)
+psit_waypoint_w_wrapper(const Waypoint* wpt)
 {
   psit_waypoint_w(psit_file_out, wpt);
 }
@@ -398,7 +398,7 @@ psit_route_r(gbfile* psit_file, route_head** rte)
   route_head* rte_head;
   unsigned int rte_count;
 
-  waypoint*    thisWaypoint;
+  Waypoint*    thisWaypoint;
 
   psit_getToken(psit_file,psit_current_token,sizeof(psit_current_token), ltrimEOL);
 
@@ -423,7 +423,7 @@ psit_route_r(gbfile* psit_file, route_head** rte)
 
   while (psit_isKnownToken(psit_current_token) != 0) {
     if (strlen(psit_current_token) > 0) {
-      thisWaypoint = new waypoint;
+      thisWaypoint = new Waypoint;
 
       thisWaypoint->latitude = atof(psit_current_token);
 
@@ -474,7 +474,7 @@ psit_routehdr_w(gbfile* psit_file, const route_head* rte)
   unsigned int rte_datapoints;
   char*                rname;
 
-  waypoint*    testwpt;
+  Waypoint*    testwpt;
   time_t               uniqueValue = 0;
   int                  allWptNameLengths;
 
@@ -488,7 +488,7 @@ psit_routehdr_w(gbfile* psit_file, const route_head* rte)
     char* c;
 
     QUEUE_FOR_EACH(&rte->waypoint_list, elem, tmp) {
-      testwpt = (waypoint*)elem;
+      testwpt = (Waypoint*)elem;
       if (rte_datapoints == 0) {
         uniqueValue = testwpt->GetCreationTime().toTime_t();
       }
@@ -547,7 +547,7 @@ psit_track_r(gbfile* psit_file, route_head** trk)
   route_head* track_head = NULL;
   unsigned int trk_count;
 
-  waypoint*    thisWaypoint;
+  Waypoint*    thisWaypoint;
 
   psit_getToken(psit_file,psit_current_token,sizeof(psit_current_token), ltrimEOL);
   if (strlen(psit_current_token) == 0) {
@@ -568,7 +568,7 @@ psit_track_r(gbfile* psit_file, route_head** trk)
 
   while (psit_isKnownToken(psit_current_token) != 0) {
     if (strlen(psit_current_token) > 0) {
-      thisWaypoint = new waypoint;
+      thisWaypoint = new Waypoint;
 
       thisWaypoint->latitude = atof(psit_current_token);
 
@@ -643,7 +643,7 @@ psit_trackhdr_w(gbfile* psit_file, const route_head* trk)
   char         hdr[30];
   unsigned int trk_datapoints;
   char*                tname;
-  waypoint*    testwpt;
+  Waypoint*    testwpt;
   time_t               uniqueValue = 0;
 
   queue* elem, *tmp;
@@ -656,7 +656,7 @@ psit_trackhdr_w(gbfile* psit_file, const route_head* trk)
 
       QUEUE_FOR_EACH(&trk->waypoint_list, elem, tmp) {
         if (trk_datapoints == 0) {
-          testwpt = (waypoint*)elem;
+          testwpt = (Waypoint*)elem;
           uniqueValue = testwpt->GetCreationTime().toTime_t();
         }
         trk_datapoints++;
@@ -703,7 +703,7 @@ psit_trackhdr_w_wrapper(const route_head* trk)
  * MRCB
  */
 static void
-psit_trackdatapoint_w(gbfile* psit_file, const waypoint* wpt)
+psit_trackdatapoint_w(gbfile* psit_file, const Waypoint* wpt)
 {
   time_t       t = wpt->GetCreationTime().toTime_t();
   struct tm* tmTime = gmtime(&t);
@@ -732,7 +732,7 @@ psit_trackdatapoint_w(gbfile* psit_file, const waypoint* wpt)
 }
 
 static void
-psit_trackdatapoint_w_wrapper(const waypoint* wpt)
+psit_trackdatapoint_w_wrapper(const Waypoint* wpt)
 {
   psit_trackdatapoint_w(psit_file_out, wpt);
 }
@@ -741,7 +741,7 @@ psit_trackdatapoint_w_wrapper(const waypoint* wpt)
 static void
 psit_read(void)
 {
-  waypoint*    wpt;
+  Waypoint*    wpt;
   route_head*  rte;
   route_head*  trk;
 
index 34b5c944633a385d5d53bcd6873229414722125a..840148d46b7594d6e10894c90724d34e729bcac4 100644 (file)
@@ -38,7 +38,7 @@ static char* maxctarg = NULL;
 static char* routename = NULL;
 static int maxct;
 
-static waypoint* home_pos;
+static Waypoint* home_pos;
 
 typedef struct {
   double distance;
@@ -91,8 +91,8 @@ gc_distance(double lat1, double lon1, double lat2, double lon2)
 static int
 dist_comp(const void* a, const void* b)
 {
-  const waypoint* x1 = *(waypoint**)a;
-  const waypoint* x2 = *(waypoint**)b;
+  const Waypoint* x1 = *(Waypoint**)a;
+  const Waypoint* x2 = *(Waypoint**)b;
   extra_data* x1e = (extra_data*) x1->extra_data;
   extra_data* x2e = (extra_data*) x2->extra_data;
 
@@ -110,17 +110,17 @@ void
 radius_process(void)
 {
   queue* elem, * tmp;
-  waypoint* waypointp;
+  Waypoint* waypointp;
   double dist;
-  waypoint** comp;
+  Waypoint** comp;
   int i, wc;
   queue temp_head;
   route_head* rte_head = NULL;
 #if NEWQ
-  foreach(waypoint* waypointp, waypt_list) {
+  foreach(Waypoint* waypointp, waypt_list) {
 #else
   QUEUE_FOR_EACH(&waypt_head, elem, tmp) {
-    waypointp = (waypoint*)elem;
+    waypointp = (Waypoint*)elem;
 #endif
     dist = gc_distance(waypointp->latitude,
                        waypointp->longitude,
@@ -144,7 +144,7 @@ radius_process(void)
   wc = waypt_count();
   QUEUE_INIT(&temp_head);
 
-  comp = (waypoint**) xcalloc(wc, sizeof(*comp));
+  comp = (Waypoint**) xcalloc(wc, sizeof(*comp));
 
   i = 0;
 
@@ -155,14 +155,14 @@ radius_process(void)
    */
 
   QUEUE_FOR_EACH(&waypt_head, elem, tmp) {
-    waypoint* wp = (waypoint*) elem;
+    Waypoint* wp = (Waypoint*) elem;
     comp[i] = wp;
     waypt_del(wp);
     i++;
   }
 
   if (!nosort) {
-    qsort(comp, wc, sizeof(waypoint*), dist_comp);
+    qsort(comp, wc, sizeof(Waypoint*), dist_comp);
   }
 
   if (routename) {
@@ -177,7 +177,7 @@ radius_process(void)
    * on through in the modified order.
    */
   for (i = 0; i < wc; i++) {
-    waypoint* wp = comp[i];
+    Waypoint* wp = comp[i];
 
     xfree(wp->extra_data);
     wp->extra_data = NULL;
@@ -217,7 +217,7 @@ radius_init(const char* args)
     maxct = 0;
   }
 
-  home_pos = (waypoint*) xcalloc(sizeof(*home_pos), 1);
+  home_pos = (Waypoint*) xcalloc(sizeof(*home_pos), 1);
 
   if (latopt) {
     home_pos->latitude = atof(latopt);
index 9c1ef3c01b2e1088e0b53c66fcde473074af5bab..c17962be61880bfbd2a1239891a93617e24b70d0 100644 (file)
@@ -112,7 +112,7 @@ random_read(void)
 
   int i, points;
   route_head* head;
-  waypoint* prev = NULL;
+  Waypoint* prev = NULL;
   time_t time = gpsbabel_time;
 
   if (opt_seed) {
@@ -142,10 +142,10 @@ random_read(void)
 
   for (i = 0; i < points; i++) {
 
-    waypoint* wpt;
+    Waypoint* wpt;
     garmin_fs_t* gmsd;
 
-    wpt = new waypoint;
+    wpt = new Waypoint;
     gmsd = garmin_fs_alloc(-1);
     fs_chain_add(&wpt->fs, (format_specific_data*) gmsd);
 
index 16b212535b8c492984ee201e0e3ed8edbeb9e482..f8e875b14b05fa8222e86101cea6169c91f83ff0 100644 (file)
@@ -55,7 +55,7 @@ typedef unsigned long long guid_t;
 
 static inifile_t* fin;
 static gbfile* fout;
-static waypoint** waypt_table;
+static Waypoint** waypt_table;
 static short_handle hshort_wpt, hshort_rte;
 static int waypt_table_sz, waypt_table_ct;
 static int rte_index, rte_wpt_index;
@@ -183,7 +183,7 @@ raymarine_rd_done(void)
 static void
 raymarine_read(void)
 {
-  waypoint* wpt;
+  Waypoint* wpt;
   unsigned int ix;
   unsigned int rx;
 
@@ -207,7 +207,7 @@ raymarine_read(void)
       break;
     }
 
-    wpt = new waypoint;
+    wpt = new Waypoint;
     wpt->shortname = name;
     wpt->latitude = atof(lat);
     wpt->longitude = atof(lon);
@@ -250,7 +250,7 @@ raymarine_read(void)
     for (wx = 0; wx < 0x3FFF; wx++) {
       char buff[32];
       char* str;
-      waypoint* wpt;
+      Waypoint* wpt;
 
       snprintf(buff, sizeof(buff), "Mk%d", wx);
       str = inifile_readstr(fin, sect, buff);
@@ -263,7 +263,7 @@ raymarine_read(void)
         fatal(MYNAME ": No associated waypoint for route point %s (Route %s)!\n",
               str, CSTRc(rte->rte_name));
 
-      route_add_wpt(rte, new waypoint(*wpt));
+      route_add_wpt(rte, new Waypoint(*wpt));
     }
   }
 }
@@ -275,7 +275,7 @@ raymarine_read(void)
 /* make waypoint shortnames unique */
 
 static char
-same_points(const waypoint* A, const waypoint* B)
+same_points(const Waypoint* A, const Waypoint* B)
 {
   return ( /* !!! We are case-sensitive !!! */
 #if NEW_STRINGS
@@ -288,13 +288,13 @@ same_points(const waypoint* A, const waypoint* B)
 }
 
 static void
-register_waypt(const waypoint* ref, const char is_rtept)
+register_waypt(const Waypoint* ref, const char is_rtept)
 {
   int i;
-  waypoint* wpt = (waypoint*) ref;
+  Waypoint* wpt = (Waypoint*) ref;
 
   for (i = 0; i < waypt_table_ct; i++) {
-    waypoint* cmp = waypt_table[i];
+    Waypoint* cmp = waypt_table[i];
 
     if (same_points(wpt, cmp)) {
       wpt->extra_data = cmp->extra_data;
@@ -305,35 +305,35 @@ register_waypt(const waypoint* ref, const char is_rtept)
   if (waypt_table_ct >= waypt_table_sz) {
     waypt_table_sz += 32;
     if (waypt_table) {
-      waypt_table = (waypoint**) xrealloc(waypt_table, waypt_table_sz * sizeof(wpt));
+      waypt_table = (Waypoint**) xrealloc(waypt_table, waypt_table_sz * sizeof(wpt));
     } else {
-      waypt_table = (waypoint**) xmalloc(waypt_table_sz * sizeof(wpt));
+      waypt_table = (Waypoint**) xmalloc(waypt_table_sz * sizeof(wpt));
     }
   }
 
   wpt->extra_data = (void*)mkshort(hshort_wpt, CSTRc(wpt->shortname));
 
-  waypt_table[waypt_table_ct] = (waypoint*)wpt;
+  waypt_table[waypt_table_ct] = (Waypoint*)wpt;
   waypt_table_ct++;
 }
 
 static void
-enum_waypt_cb(const waypoint* wpt)
+enum_waypt_cb(const Waypoint* wpt)
 {
-  register_waypt((waypoint*) wpt, 0);
+  register_waypt((Waypoint*) wpt, 0);
 }
 
 static void
-enum_rtept_cb(const waypoint* wpt)
+enum_rtept_cb(const Waypoint* wpt)
 {
-  register_waypt((waypoint*) wpt, 1);
+  register_waypt((Waypoint*) wpt, 1);
 }
 
 static int
 qsort_cb(const void* a, const void* b)
 {
-  const waypoint* wa = *(waypoint**)a;
-  const waypoint* wb = *(waypoint**)b;
+  const Waypoint* wa = *(Waypoint**)a;
+  const Waypoint* wb = *(Waypoint**)b;
 #if NEW_STRINGS
   return wa->shortname.compare(wb->shortname);
 #else
@@ -342,7 +342,7 @@ qsort_cb(const void* a, const void* b)
 }
 
 static void
-write_waypoint(gbfile* fout, const waypoint* wpt, const int waypt_no, const char* location)
+write_waypoint(gbfile* fout, const Waypoint* wpt, const int waypt_no, const char* location)
 {
   QString notes;
   char* name;
@@ -410,7 +410,7 @@ write_route_head_cb(const route_head* rte)
 }
 
 static void
-write_route_wpt_cb(const waypoint* wpt)
+write_route_wpt_cb(const Waypoint* wpt)
 {
   static const char* items[] = {
     "Cog",
@@ -480,7 +480,7 @@ static void
 raymarine_write(void)
 {
   int i;
-  waypoint* wpt;
+  Waypoint* wpt;
 
   waypt_table_sz = 0;
   waypt_table_ct = 0;
@@ -498,7 +498,7 @@ raymarine_write(void)
 
   /* write out waypoint summary */
   for (i = 0; i < waypt_table_ct; i++) {
-    waypoint* wpt = waypt_table[i];
+    Waypoint* wpt = waypt_table[i];
     write_waypoint(fout, wpt, i, opt_location);
   }
 
index be466cd38459927e663869ab98b94aacfec9e7f9..48637346324303bc538fdda906e4507b6d4e9c00 100644 (file)
@@ -35,11 +35,11 @@ arglist_t reverse_route_args[] = {
 /*
  * reverse_route_wpt fixes up the waypoint flag new_trkseg
  */
-static void reverse_route_wpt(const waypoint* waypointp)
+static void reverse_route_wpt(const Waypoint* waypointp)
 {
 
   /* Cast away const-ness */
-  waypoint* wpp = (waypoint*) waypointp;
+  Waypoint* wpp = (Waypoint*) waypointp;
 
   int curr_new_trkseg;
 
index ac2eba0d40e0ecfcc5b68e01caf6dd1fc25b38cd..ab7f754015e336ddf1299a26f798ba003c544b02 100644 (file)
@@ -29,7 +29,7 @@ static int rte_waypts;
 static int trk_head_ct;
 static int trk_waypts;
 
-extern void update_common_traits(const waypoint* wpt);
+extern void update_common_traits(const Waypoint* wpt);
 
 void
 route_init(void)
@@ -166,7 +166,7 @@ route_find_track_by_name(const char* name)
 }
 
 static void
-any_route_add_wpt(route_head* rte, waypoint* wpt, int* ct, int synth, const QString& namepart, int number_digits)
+any_route_add_wpt(route_head* rte, Waypoint* wpt, int* ct, int synth, const QString& namepart, int number_digits)
 {
   ENQUEUE_TAIL(&rte->waypoint_list, &wpt->Q);
   rte->rte_waypt_ct++; /* waypoints in this route */
@@ -181,7 +181,7 @@ any_route_add_wpt(route_head* rte, waypoint* wpt, int* ct, int synth, const QStr
 }
 
 void
-route_add_wpt_named(route_head* rte, waypoint* wpt, const QString& namepart, int number_digits)
+route_add_wpt_named(route_head* rte, Waypoint* wpt, const QString& namepart, int number_digits)
 {
   // First point in a route is always a new segment.
   // This improves compatibility when reading from
@@ -194,14 +194,14 @@ route_add_wpt_named(route_head* rte, waypoint* wpt, const QString& namepart, int
 }
 
 void
-route_add_wpt(route_head* rte, waypoint* wpt)
+route_add_wpt(route_head* rte, Waypoint* wpt)
 {
   const char RPT[] = "RPT";
   route_add_wpt_named(rte, wpt, RPT, 3);
 }
 
 void
-track_add_wpt_named(route_head* rte, waypoint* wpt, const QString& namepart, int number_digits)
+track_add_wpt_named(route_head* rte, Waypoint* wpt, const QString& namepart, int number_digits)
 {
   // First point in a track is always a new segment.
   // This improves compatibility when reading from
@@ -214,19 +214,19 @@ track_add_wpt_named(route_head* rte, waypoint* wpt, const QString& namepart, int
 }
 
 void
-track_add_wpt(route_head* rte, waypoint* wpt)
+track_add_wpt(route_head* rte, Waypoint* wpt)
 {
   const char RPT[] = "RPT";
   track_add_wpt_named(rte, wpt, RPT, 3);
 }
 
-waypoint*
+Waypoint*
 route_find_waypt_by_name(route_head* rh, const char* name)
 {
   queue* elem, *tmp;
 
   QUEUE_FOR_EACH(&rh->waypoint_list, elem, tmp) {
-    waypoint* waypointp = (waypoint*) elem;
+    Waypoint* waypointp = (Waypoint*) elem;
     if (waypointp->shortname == name) {
       return waypointp;
     }
@@ -235,10 +235,10 @@ route_find_waypt_by_name(route_head* rh, const char* name)
 }
 
 static void
-any_route_del_wpt(route_head* rte, waypoint* wpt, int* ct)
+any_route_del_wpt(route_head* rte, Waypoint* wpt, int* ct)
 {
-  if (wpt->wpt_flags.new_trkseg && wpt != (waypoint*)QUEUE_LAST(&rte->waypoint_list)) {
-    waypoint* wpt_next = (waypoint*)QUEUE_NEXT(&wpt->Q);
+  if (wpt->wpt_flags.new_trkseg && wpt != (Waypoint*)QUEUE_LAST(&rte->waypoint_list)) {
+    Waypoint* wpt_next = (Waypoint*)QUEUE_NEXT(&wpt->Q);
     wpt_next->wpt_flags.new_trkseg = 1;
   }
   wpt->wpt_flags.new_trkseg = 0;
@@ -250,13 +250,13 @@ any_route_del_wpt(route_head* rte, waypoint* wpt, int* ct)
 }
 
 void
-route_del_wpt(route_head* rte, waypoint* wpt)
+route_del_wpt(route_head* rte, Waypoint* wpt)
 {
   any_route_del_wpt(rte, wpt, &rte_waypts);
 }
 
 void
-track_del_wpt(route_head* rte, waypoint* wpt)
+track_del_wpt(route_head* rte, Waypoint* wpt)
 {
   any_route_del_wpt(rte, wpt, &trk_waypts);
 }
@@ -269,8 +269,8 @@ route_disp(const route_head* rh, waypt_cb cb)
     return;
   }
   QUEUE_FOR_EACH(&rh->waypoint_list, elem, tmp) {
-    waypoint* waypointp;
-    waypointp = (waypoint*) elem;
+    Waypoint* waypointp;
+    waypointp = (Waypoint*) elem;
     (*cb)(waypointp);
   }
 
@@ -422,7 +422,7 @@ route_copy(int* dst_count, int* dst_wpt_count, queue** dst, queue* src)
     rte_new->rte_num = rte_old->rte_num;
     any_route_add_head(rte_new, *dst);
     QUEUE_FOR_EACH(&rte_old->waypoint_list, elem2, tmp2) {
-      any_route_add_wpt(rte_new, new waypoint(*(waypoint*)elem2), dst_wpt_count, 0, RPT, 3);
+      any_route_add_wpt(rte_new, new Waypoint(*(Waypoint*)elem2), dst_wpt_count, 0, RPT, 3);
     }
     (*dst_count)++;
   }
@@ -469,14 +469,14 @@ route_restore_tlr(const route_head* rte)
 }
 
 static void
-route_restore_wpt(const waypoint* wpt)
+route_restore_wpt(const Waypoint* wpt)
 {
   (void)wpt;
   rte_waypts++;
 }
 
 static void
-track_restore_wpt(const waypoint* wpt)
+track_restore_wpt(const Waypoint* wpt)
 {
   (void)wpt;
   trk_waypts++;
@@ -569,9 +569,9 @@ tracks_to_routes(void)
  */
 void track_recompute(const route_head* trk, computed_trkdata** trkdatap)
 {
-  waypoint first;
-  waypoint* thisw;
-  waypoint* prev = &first;
+  Waypoint first;
+  Waypoint* thisw;
+  Waypoint* prev = &first;
   queue* elem, *tmp;
   int tkpt = 0;
   int pts_hrt = 0;
@@ -594,7 +594,7 @@ void track_recompute(const route_head* trk, computed_trkdata** trkdatap)
   QUEUE_FOR_EACH((queue*)&trk->waypoint_list, elem, tmp) {
     double tlat, tlon, plat, plon, dist;
 
-    thisw = (waypoint*)elem;
+    thisw = (Waypoint*)elem;
 
     /*
      * gcdist and heading want radians, not degrees.
index 868689d1a2c3bd176d012c0cdbd1e8f25ca56a4a..e01ce71093f1c537bcf7541f98d41c57aae9a55c 100644 (file)
@@ -132,7 +132,7 @@ my_read(void)
   uint16_t coordcount;
   route_head* track_head = NULL;
   route_head* old_track_head = NULL;
-  waypoint* wpt_tmp;
+  Waypoint* wpt_tmp;
   char* routename = NULL;
   double seglen = 0.0;
   int32_t  starttime = 0;
@@ -205,7 +205,7 @@ my_read(void)
       lon = (0x80000000UL -
              le_read32(&latlon->lat)) / (double)(0x800000);
 
-      wpt_tmp = new waypoint;
+      wpt_tmp = new Waypoint;
       wpt_tmp->latitude = lat;
       wpt_tmp->longitude = -lon;
       if (control) {
@@ -363,7 +363,7 @@ my_read(void)
         double lat;
         double lon;
 
-        wpt_tmp = new waypoint;
+        wpt_tmp = new Waypoint;
 
         lat = (0x80000000UL -
                le_read32(&latlon->lat)) /
@@ -425,10 +425,10 @@ my_read(void)
           if (old_track_head) {
             if (timesynth) {
               track_add_wpt(old_track_head,
-                            new waypoint(*wpt_tmp));
+                            new Waypoint(*wpt_tmp));
             } else {
               route_add_wpt(old_track_head,
-                            new waypoint(*wpt_tmp));
+                            new Waypoint(*wpt_tmp));
             }
             old_track_head = NULL;
           }
index df51d28b2f4861babaed618f35225f4bbc5271a1..06979184c75078fcd9c46b42ca220a16eea9a327 100644 (file)
@@ -213,7 +213,7 @@ decode_sbn_mode(const unsigned char* mode)
 }
 
 static void
-decode_sbn_datetime(const unsigned char* buffer, waypoint* waypt)
+decode_sbn_datetime(const unsigned char* buffer, Waypoint* waypt)
 {
   struct tm tm;
   int ms = be_readu16(buffer + 6);
@@ -229,18 +229,18 @@ decode_sbn_datetime(const unsigned char* buffer, waypoint* waypt)
 }
 
 static void
-decode_sbn_position(const unsigned char* buffer, waypoint* waypt)
+decode_sbn_position(const unsigned char* buffer, Waypoint* waypt)
 {
   waypt->latitude = be_read32(buffer + 0) * 0.0000001;
   waypt->longitude = be_read32(buffer + 4) * 0.0000001;
   waypt->altitude = be_read32(buffer + 12) * 0.01;
 }
 
-static waypoint*
+static Waypoint*
 decode_sbn_record(unsigned char* buffer)
 {
-  waypoint* waypt = NULL;
-  waypt = new waypoint;
+  Waypoint* waypt = NULL;
+  waypt = new Waypoint;
 
   if (is_sbn_valid(buffer)) {
     waypt->fix = decode_sbn_mode(buffer + 3);
index afb64c5965dd36ffe22fe098915fdef5bece2855..abe7f8ead63c05cd5e7924defb7e04dc7833a920 100644 (file)
@@ -83,7 +83,7 @@ read_sbp_header(route_head* track)
   }
 }
 
-static waypoint*
+static Waypoint*
 read_logpoint(void)
 {
   unsigned char buffer[SBP_RECORD_LEN];
@@ -99,7 +99,7 @@ static void
 sbp_read(void)
 {
   if (global_opts.masked_objective & TRKDATAMASK) {
-    waypoint* logpoint;
+    Waypoint* logpoint;
     route_head*     track;
 
     track = route_head_alloc();
index 87ea24ac8765192da710c24ee09ce5a69c2cff22..9c7eba7a30eac4b8385154ee32489e49d307626d 100644 (file)
@@ -118,7 +118,7 @@ my_read(void)
 
   while (npts) {
     SHPObject* shp;
-    waypoint* wpt;
+    Waypoint* wpt;
     const char* name = "";
     const char* url;
     char* tmpName = NULL;
@@ -172,7 +172,7 @@ my_read(void)
       routehead->rte_name = name;
       route_add_head(routehead);
       for (j = 0; j < shp->nVertices; j++) {
-        wpt = new waypoint;
+        wpt = new Waypoint;
         wpt->latitude = shp->padfY[j];
         wpt->longitude = shp->padfX[j];
         wpt->altitude = shp->padfZ[j];
@@ -182,7 +182,7 @@ my_read(void)
     break;
 
     case SHPT_POINT:
-      wpt = new waypoint;
+      wpt = new Waypoint;
       wpt->latitude = shp->dfYMin;
       wpt->longitude = shp->dfXMin;
       wpt->shortname = name;
@@ -262,7 +262,7 @@ my_wr_deinit(void)
 }
 
 void
-my_write_wpt(const waypoint* wpt)
+my_write_wpt(const Waypoint* wpt)
 {
   SHPObject* shpobject;
 
@@ -285,7 +285,7 @@ poly_init(const route_head* h)
 
 
 void
-poly_point(const waypoint* wpt)
+poly_point(const Waypoint* wpt)
 {
   polybufx[poly_count] = wpt->longitude;
   polybufy[poly_count] = wpt->latitude;
index 2485dbc61a3d484a1e7c48e65b2c0b571d0fd720..954bc1d194d8692e9a62dc99f9e408cd84e05e0a 100644 (file)
@@ -38,19 +38,19 @@ arglist_t skyforce_args[] = {
 static gbfile* fin, *fout;
 static int rte_num, wpt_num;
 static short_handle short_h;
-static const waypoint* prev_wpt;
+static const Waypoint* prev_wpt;
 
 
-static waypoint*
+static Waypoint*
 skyforce_parse_coords(const char* str)
 {
-  waypoint* wpt;
+  Waypoint* wpt;
 
   if (strlen(str) < 38) {
     fatal(MYNAME ": Incomplete line!\n");
   }
 
-  wpt = new waypoint;
+  wpt = new Waypoint;
 
   wpt->latitude = atof(str + 21);
   if (str[20] == 'S') {
@@ -68,10 +68,10 @@ skyforce_parse_coords(const char* str)
 }
 
 
-static waypoint*
+static Waypoint*
 skyforce_parse_wpt(const char* str, int* rte_num)
 {
-  waypoint* wpt;
+  Waypoint* wpt;
 
   wpt = skyforce_parse_coords(str);
   if (wpt == NULL) {
@@ -91,13 +91,13 @@ skyforce_parse_wpt(const char* str, int* rte_num)
 }
 
 
-static waypoint*
+static Waypoint*
 skyforce_parse_trk(const char* str)
 {
   char buf[15];
   int len;
 
-  waypoint* wpt;
+  Waypoint* wpt;
 
   wpt = skyforce_parse_coords(str);
   if (wpt == NULL) {
@@ -148,7 +148,7 @@ skyforce_head_disp_cb(const route_head* head)
 
 
 static void
-skyforce_waypt_disp_cb(const waypoint* wpt)
+skyforce_waypt_disp_cb(const Waypoint* wpt)
 {
   char buf[75];        /* long enough for all data types */
   double lat, lon;
@@ -261,7 +261,7 @@ skyforce_read(void)
 
   while ((str = gbfgetstr(fin))) {
 
-    waypoint* wpt;
+    Waypoint* wpt;
     int i;
 
     str = lrtrim(str);
index dfdc6bff03a67f2f41211802be44ac7432168980..6f0445a93ef956993b4a30ac4fc6e1b5ba968a31 100644 (file)
@@ -658,10 +658,10 @@ state_init(struct read_state* pst)
   pst->z          = 0;
 }
 
-static waypoint*
+static Waypoint*
 make_trackpoint(struct read_state* st, double lat, double lon, double alt)
 {
-  waypoint* wpt = new waypoint;
+  Waypoint* wpt = new Waypoint;
 
   xasprintf(&wpt->shortname, "TP%04d", ++st->tpn);
 
@@ -743,7 +743,7 @@ process_data_item(struct read_state* pst, const item_frame* pitem, int len)
   full_item f;
   compact_item c;
   multi_hz_item m;
-  waypoint* tpt = NULL;
+  Waypoint* tpt = NULL;
 
   switch (ITEM_TYPE(pitem)) {
 
@@ -858,7 +858,7 @@ process_data_item(struct read_state* pst, const item_frame* pitem, int len)
     WAYPT_SET(tpt, speed, KPH_TO_MPS(ITEM_SPEED(pitem))); /* convert speed to m/s */
 
     if (poi) {
-      waypt_add(new waypoint(*tpt));
+      waypt_add(new Waypoint(*tpt));
     }
 
     if (0 == pst->route_head_) {
@@ -1508,7 +1508,7 @@ static void miniHomer_get_poi()
   unsigned int poi;
   double lat, lng, alt;
   double ecef_x, ecef_y, ecef_z;
-  waypoint* wpt;
+  Waypoint* wpt;
 
   for (poi=0; poi<NUMPOI; poi++) {
     MSG_GET_POI[1]=(poi>>8)&0xff;
@@ -1527,7 +1527,7 @@ static void miniHomer_get_poi()
     } else {
       ECEF_to_LLA(ecef_x, ecef_y, ecef_z, &lat, &lng, &alt);
 
-      wpt = new waypoint;
+      wpt = new Waypoint;
       xasprintf(&wpt->shortname, "POI_%s", poinames[poi]);
       xasprintf(&wpt->description, "miniHomer points to this coordinates if the %s symbol is on", poinames[poi]);
       wpt->latitude       = lat;
index 520059fd651496ff4aca5e1fcf657112477a4905..e5f0e0143e6be0093c5699c75b323693dc9cd982 100644 (file)
@@ -73,7 +73,7 @@ static char* erroropt;
 static char* xteopt;
 static char* lenopt;
 static char* relopt;
-void (*waypt_del_fnp)(route_head* rte, waypoint* wpt);
+void (*waypt_del_fnp)(route_head* rte, Waypoint* wpt);
 
 static
 arglist_t routesimple_args[] = {
@@ -112,7 +112,7 @@ struct xte_intermed {
   struct xte* xte_rec;
   struct xte_intermed* next;
   struct xte_intermed* prev;
-  const waypoint* wpt;
+  const Waypoint* wpt;
 };
 
 void
@@ -129,7 +129,7 @@ static const route_head* cur_rte = NULL;
 static struct xte* xte_recs = NULL;
 
 void
-routesimple_waypt_pr(const waypoint* wpt)
+routesimple_waypt_pr(const Waypoint* wpt)
 {
   if (!cur_rte) {
     return;
@@ -150,9 +150,9 @@ routesimple_waypt_pr(const waypoint* wpt)
 void
 compute_xte(struct xte* xte_rec)
 {
-  const waypoint* wpt3 = xte_rec->intermed->wpt;
-  const waypoint* wpt1 = NULL;
-  const waypoint* wpt2 = NULL;
+  const Waypoint* wpt3 = xte_rec->intermed->wpt;
+  const Waypoint* wpt1 = NULL;
+  const Waypoint* wpt2 = NULL;
   double frac, reslat, reslon;
   /* if no previous, this is an endpoint and must be preserved. */
   if (!xte_rec->intermed->prev) {
@@ -336,8 +336,8 @@ routesimple_tail(const route_head* rte)
       }
     }
     (*waypt_del_fnp)((route_head*)(void*)rte,
-                     (waypoint*)(void*)(xte_recs[i].intermed->wpt));
-    delete (waypoint*)(void*)(xte_recs[i].intermed->wpt);
+                     (Waypoint*)(void*)(xte_recs[i].intermed->wpt));
+    delete (Waypoint*)(void*)(xte_recs[i].intermed->wpt);
 
     if (xte_recs[i].intermed->prev) {
       xte_recs[i].intermed->prev->next = xte_recs[i].intermed->next;
index 1f523f5399f83fad0dc82020b06388b9d009dfbe..4d98e5b4d945efb31424a6707bdbd7b99e134699 100644 (file)
@@ -59,8 +59,8 @@ arglist_t sort_args[] = {
 static int
 sort_comp(const queue* a, const queue* b)
 {
-  const waypoint* x1 = (waypoint*)a;
-  const waypoint* x2 = (waypoint*)b;
+  const Waypoint* x1 = (Waypoint*)a;
+  const Waypoint* x2 = (Waypoint*)b;
 
   switch (sort_mode)  {
   case sm_gcid:
index 4e2c61faeb53cb17771fedd80c3a54253551a14b..de738f58d464bfc530b720707e1198a69e7c177d 100644 (file)
@@ -109,7 +109,7 @@ stackfilt_process(void)
     stack = tmp_elt;
     if (opt_copy) {
       QUEUE_FOR_EACH(&(stack->waypts), elem, tmp) {
-        waypt_add(new waypoint(*(waypoint*)elem));
+        waypt_add(new Waypoint(*(Waypoint*)elem));
       }
     }
 
@@ -136,7 +136,7 @@ stackfilt_process(void)
     }
     if (opt_append) {
       QUEUE_FOR_EACH(&(stack->waypts), elem, tmp) {
-        waypt_add((waypoint*)elem);
+        waypt_add((Waypoint*)elem);
       }
       route_append(&(stack->routes));
       route_flush(&(stack->routes));
index cc88b77c5f91aebbfbf8b861a1922ae767e4181f..5b9c630feb767c31e84683bec6b0a513b14b66c4 100644 (file)
@@ -64,7 +64,7 @@ static queue trackpts;
 static QString rte_name;
 static QString rte_desc;
 
-static waypoint* trkpt_out;
+static Waypoint* trkpt_out;
 static route_head* trk_out;
 
 static double trkpt_dist;
@@ -166,8 +166,8 @@ parse_header(char* line)
 static int
 track_qsort_cb(const void* a, const void* b)
 {
-  const waypoint* wa = *(waypoint**)a;
-  const waypoint* wb = *(waypoint**)b;
+  const Waypoint* wa = *(Waypoint**)a;
+  const Waypoint* wb = *(Waypoint**)b;
 
   return wa->GetCreationTime().toTime_t() - wb->GetCreationTime().toTime_t();
 }
@@ -175,7 +175,7 @@ track_qsort_cb(const void* a, const void* b)
 static void
 finalize_tracks(void)
 {
-  waypoint** list;
+  Waypoint** list;
   int count = 0;
   queue* elem, *tmp;
   int index;
@@ -190,11 +190,11 @@ finalize_tracks(void)
     return;
   }
 
-  list = (waypoint**)xmalloc(count * sizeof(*list));
+  list = (Waypoint**)xmalloc(count * sizeof(*list));
 
   index = 0;
   QUEUE_FOR_EACH(&trackpts, elem, tmp) {
-    list[index] = (waypoint*)elem;
+    list[index] = (Waypoint*)elem;
     dequeue(elem);
     index++;
   }
@@ -202,7 +202,7 @@ finalize_tracks(void)
   qsort(list, count, sizeof(*list), track_qsort_cb);
 
   for (index = 0; index < count; index++) {
-    waypoint* wpt = list[index];
+    Waypoint* wpt = list[index];
     if (wpt->wpt_flags.fmt_use == 2) { /* log continued */
       track = NULL;
     }
@@ -237,7 +237,7 @@ parse_point(char* line)
   char* str;
   int column = -1;
   int what = -1;               /* -1 = unknown, 0 = tp, 1 = mp, 2 = wp, 3 = ap  */
-  waypoint* wpt = NULL;
+  Waypoint* wpt = NULL;
   char* cx;
   int hour, min, sec, day, month, year;
 
@@ -264,7 +264,7 @@ parse_point(char* line)
         warning(MYNAME ": Unknown point type %s at line %d!\n", str, lineno);
         return;
       }
-      wpt = new waypoint;
+      wpt = new Waypoint;
       break;
 
     case 1:
@@ -433,7 +433,7 @@ data_read(void)
 
 
 static void
-calculate(const waypoint* wpt, double* dist, double* speed, double* course,
+calculate(const Waypoint* wpt, double* dist, double* speed, double* course,
           double* asc, double* desc)
 {
   if (trkpt_out != NULL) {
@@ -516,7 +516,7 @@ any_hdr_calc_cb(const route_head* trk)
 }
 
 static void
-any_waypt_calc_cb(const waypoint* wpt)
+any_waypt_calc_cb(const Waypoint* wpt)
 {
   double speed, course, dist;
 
@@ -547,7 +547,7 @@ any_waypt_calc_cb(const waypoint* wpt)
     this_time += (wpt->GetCreationTime().toTime_t() - trkpt_out->GetCreationTime().toTime_t());
   }
 
-  trkpt_out = (waypoint*)wpt;
+  trkpt_out = (Waypoint*)wpt;
 }
 
 static void
@@ -575,7 +575,7 @@ track_disp_hdr_cb(const route_head* trk)
 
 
 static void
-track_disp_wpt_cb(const waypoint* wpt)
+track_disp_wpt_cb(const Waypoint* wpt)
 {
   struct tm tm;
   char tbuf[32];
@@ -633,7 +633,7 @@ track_disp_wpt_cb(const waypoint* wpt)
     gbfprintf(fout, ",0\n");
   }
 
-  trkpt_out = (waypoint*)wpt;
+  trkpt_out = (Waypoint*)wpt;
 }
 
 static void
@@ -650,7 +650,7 @@ route_disp_hdr_cb(const route_head* rte)
 }
 
 static void
-route_disp_wpt_cb(const waypoint* wpt)
+route_disp_wpt_cb(const Waypoint* wpt)
 {
   if (this_route_valid) {
     QString sn;
@@ -667,7 +667,7 @@ route_disp_wpt_cb(const waypoint* wpt)
 }
 
 static void
-track_disp_custom_cb(const waypoint* wpt)
+track_disp_custom_cb(const Waypoint* wpt)
 {
   if (wpt->GetCreationTime().isValid() && (wpt->altitude != unknown_alt)) {
     gbfprintf(fout, "%d,%.f\n", (int)(wpt->GetCreationTime().toTime_t() - start_time), wpt->altitude);
index 4b0fce94024d22f785e1327f5bc71ff77ba5ae17..602fd232cd9acaa09339e2d6930566f400677ff6 100644 (file)
@@ -32,7 +32,7 @@
 
 static gbfile* fin, *fout;
 static route_head* track, *route;
-static waypoint* wpt;
+static Waypoint* wpt;
 static short_handle short_h;
 
 #define MYNAME "STMwpp"
@@ -125,7 +125,7 @@ stmwpp_data_read(void)
         }
 
         what = new_what;
-        wpt = new waypoint;
+        wpt = new Waypoint;
         break;
 
       case 1:
@@ -175,7 +175,7 @@ stmwpp_data_read(void)
             route = route_head_alloc();
             route_add_head(route);
           }
-          route_add_wpt(route, new waypoint(*wpt));
+          route_add_wpt(route, new Waypoint(*wpt));
         }
         break;
 
@@ -229,7 +229,7 @@ stmwpp_write_double(const double val)
 }
 
 static void
-stmwpp_waypt_cb(const waypoint* wpt)
+stmwpp_waypt_cb(const Waypoint* wpt)
 {
   char cdate[16], ctime[16];
   struct tm tm;
index f1939b74e27d92de8aa936e874de8e910ef81761..d67d29e0efd0b99733d3fe99656d6ad8632cf119 100644 (file)
@@ -30,7 +30,7 @@ static char* opt_gpsdate;
 static time_t time_offset;
 static int stnum;
 static gbfile* fout;
-static const waypoint* prevwpp;
+static const Waypoint* prevwpp;
 
 /* internal helper functions */
 
@@ -84,7 +84,7 @@ subrip_write_time(time_t arg_time)
 }
 
 static void
-subrip_prevwp_pr(const waypoint* waypointp)
+subrip_prevwp_pr(const Waypoint* waypointp)
 {
   /* Now that we have the next waypoint, we can write out the subtitle for
    * the previous one.
@@ -131,7 +131,7 @@ subrip_prevwp_pr(const waypoint* waypointp)
 /* callback functions */
 
 static void
-subrip_trkpt_pr(const waypoint* waypointp)
+subrip_trkpt_pr(const Waypoint* waypointp)
 {
   /*
    * To determine the duration of the subtitle, we need the timestamp of the
index 40f318386666329320f85162434ac9143c3a98e6..b6350e68d2188cc959252d77befc7c2ad53229ba 100644 (file)
@@ -34,9 +34,9 @@ arglist_t swapdata_args[] = {
 };
 
 static void
-swapdata_cb(const waypoint* ref)
+swapdata_cb(const Waypoint* ref)
 {
-  waypoint* wpt = (waypoint*)ref;
+  Waypoint* wpt = (Waypoint*)ref;
   double x;
 
   x = wpt->latitude;
index bd8df79337aca0e70066a1dfa8b1a1e5d0dad20f..7b9d190e758962768092d19ae9836f0403d73eb2 100644 (file)
@@ -28,7 +28,7 @@
 #include "defs.h"
 #include "xmlgeneric.h"
 
-static waypoint* wpt_tmp;
+static Waypoint* wpt_tmp;
 static int item_count;
 static int waypoints;
 static double version;
@@ -211,7 +211,7 @@ waypoint_final()
 
   if (route != NULL) {
     if ((via != 0) || (routevia == NULL)) {
-      waypoint* wpt = new waypoint(*wpt_tmp);
+      Waypoint* wpt = new Waypoint(*wpt_tmp);
       route_add_wpt(route, wpt);
     }
   }
@@ -243,7 +243,7 @@ tef_item_start(xg_string args, const QXmlStreamAttributes* attrv)
 {
   waypoints++;
 
-  wpt_tmp = new waypoint;
+  wpt_tmp = new Waypoint;
   if ((waypoints == 1) || (waypoints == item_count)) {
     wpt_tmp->wpt_flags.fmt_use ++;
   }
index a2eb412c5dc4700a42e3f5208e0e3479d6307695..ee4a5616266033dc84b3ab61bb86270f3b767c7f 100644 (file)
@@ -59,7 +59,7 @@ teletype_read(void)
 {
   uint32_t i;
   for (i = 0; i < tty_wpt_count; i++) {
-    waypoint* wpt = new waypoint;
+    Waypoint* wpt = new Waypoint;
     wpt->shortname = (gbfgetcstr(fin));
     wpt->description = (gbfgetcstr(fin));
 
index 408824505424a9afecf2a8b21e3dd33988a6f22c..765a2babcd734e4f49a811e44098e34f0773b024 100644 (file)
@@ -94,7 +94,7 @@ wr_deinit(void)
 }
 
 static void
-text_disp(const waypoint* wpt)
+text_disp(const Waypoint* wpt)
 {
   int32_t utmz;
   double utme, utmn;
index 77a0e067a2b3a3d42061ff673fb49e7addc35468..865ede221d44a8d173a139a142e9f89b18afead0 100644 (file)
@@ -157,7 +157,7 @@ data_read(void)
   char desc[100];
   char icon[100];
   char* ibuf;
-  waypoint* wpt_tmp;
+  Waypoint* wpt_tmp;
   int line = 0;
 
   while ((ibuf = gbfgetstr(file_in))) {
@@ -166,7 +166,7 @@ data_read(void)
     }
     if (sscanf(ibuf, "%lf,%lf:%100[^:]:%100[^\n]",
                &lon, &lat, icon, desc)) {
-      wpt_tmp = new waypoint;
+      wpt_tmp = new Waypoint;
 
       wpt_tmp->longitude = lon;
       wpt_tmp->latitude = lat;
@@ -179,7 +179,7 @@ data_read(void)
 }
 
 static void
-tiger_disp(const waypoint* wpt)
+tiger_disp(const Waypoint* wpt)
 {
   QString pin;
   double lat = wpt->latitude;
@@ -229,7 +229,7 @@ tiger_disp(const waypoint* wpt)
 
 #if CLICKMAP
 static void
-map_plot(const waypoint* wpt)
+map_plot(const Waypoint* wpt)
 {
   static int x,y;
 
index a09a36d461cd30de82389d16989dbcdeff8e4bb2..de21342feb48536260ffe646b25415dcff391325 100644 (file)
@@ -70,7 +70,7 @@ data_read(void)
 {
   char* buff;
   char* s;
-  waypoint* wpt_tmp;
+  Waypoint* wpt_tmp;
   int i;
   int linecount = 0;
 
@@ -82,7 +82,7 @@ data_read(void)
     /* skip the line if it contains "sHyperLink" as it is a header (I hope :) */
     if ((strlen(buff)) && (strstr(buff, "sHyperLink") == NULL)) {
 
-      wpt_tmp = new waypoint;
+      wpt_tmp = new Waypoint;
 
       /* data delimited by tabs, not enclosed in quotes.  */
       s = buff;
@@ -169,7 +169,7 @@ data_read(void)
 }
 
 static void
-tmpro_waypt_pr(const waypoint* wpt)
+tmpro_waypt_pr(const Waypoint* wpt)
 {
   int icon = 1; /* default to "flag" */
   int colour = 255; /*default to red */
index 9eb72146b4843acc3468cc1de51242f98176b5d7..d6ffbcba7028d240f5a493ba8e8768145248fdad 100644 (file)
@@ -152,7 +152,7 @@ data_read(void)
   long x;
   long y;
   char* desc;
-  waypoint* wpt_tmp;
+  Waypoint* wpt_tmp;
   while (!gbfeof(file_in)) {
     rectype = read_char(file_in);
     if (rectype == EOF) {
@@ -191,7 +191,7 @@ data_read(void)
       desc = (char*)xmalloc(recsize - 13);
       gbfread(desc, recsize-13, 1, file_in);
 
-      wpt_tmp = new waypoint;
+      wpt_tmp = new Waypoint;
 
       wpt_tmp->longitude = x/100000.0;
       wpt_tmp->latitude = y/100000.0;
@@ -212,7 +212,7 @@ data_read(void)
 #if 0 // Fallthrough for now to silently ignore these until this is done.
       recsize = read_char(file_in) ;
       check_recsize(recsize);
-      wpt_tmp = new waypoint;
+      wpt_tmp = new Waypoint;
       decode_latlon(&wpt_tmp->latitude, &wpt_tmp->longitude);
       gbfread(tbuf, 3, 1, file_in);
       gbfread(tbuf, 3, 1, file_in);
@@ -241,7 +241,7 @@ data_read(void)
 
 
 struct hdr {
-  waypoint* wpt;
+  Waypoint* wpt;
 };
 
 static int compare_lon(const void* a, const void* b);
@@ -375,7 +375,7 @@ compute_blocks(struct hdr* start, int count,
   newblock->size = 4 * 5 + 1;   /* hdr is 5 longs, 1 char */
   if (count < 20) {
     int i;
-    waypoint* wpt = NULL;
+    Waypoint* wpt = NULL;
 
     for (i = 0; i < count; i++) {
       newblock->size += 4 * 3 + 1;
@@ -436,7 +436,7 @@ data_write(void)
   struct hdr* htable, *bh;
   queue* elem, *tmp;
   extern queue waypt_head;
-  waypoint* waypointp;
+  Waypoint* waypointp;
   double minlon = 200;
   double maxlon = -200;
   double minlat = 200;
@@ -447,7 +447,7 @@ data_write(void)
   bh = htable;
 
   QUEUE_FOR_EACH(&waypt_head, elem, tmp) {
-    waypointp = (waypoint*) elem;
+    waypointp = (Waypoint*) elem;
     bh->wpt = waypointp;
     if (waypointp->longitude > maxlon) {
       maxlon = waypointp->longitude;
index e56bc40a18c269d9303df534a6abf19ffda97012..c41dd9f33102096f5eb27b399d4e7f4d418ab3a4 100644 (file)
@@ -103,7 +103,7 @@ static void
 tpg_read(void)
 {
   char buff[MAXTPGSTRINGSIZE + 1];
-  waypoint* wpt_tmp;
+  Waypoint* wpt_tmp;
   double lat, lon, elev;
   double amt;
   short int pointcount;
@@ -119,7 +119,7 @@ tpg_read(void)
 
 
   while (pointcount--) {
-    wpt_tmp = new waypoint;
+    wpt_tmp = new Waypoint;
 
     /* pascal-like shortname */
     wpt_tmp->shortname = gbfgetpstr(tpg_file_in);
@@ -166,7 +166,7 @@ tpg_read(void)
 }
 
 static void
-tpg_waypt_pr(const waypoint* wpt)
+tpg_waypt_pr(const Waypoint* wpt)
 {
   double lon, lat;
   double amt;
index 0d4fef280a84c2bfef03b5b854bae7ee24f71a7b..c1bb98b4d1333d85f042382781d3f5fad19f09e4 100644 (file)
@@ -261,7 +261,7 @@ void tpo_read_2_x(void)
   short* lon_delta, *lat_delta;
   int i, j;
   route_head* track_temp;
-  waypoint* waypoint_temp;
+  Waypoint* waypoint_temp;
 
   /* track count */
   track_count = gbfgetint16(tpo_file_in);
@@ -342,7 +342,7 @@ void tpo_read_2_x(void)
     /* multiply all the deltas by the scaling factors to determine the waypoint positions */
     for (j=0; j<waypoint_count; j++) {
 
-      waypoint_temp = new waypoint;
+      waypoint_temp = new Waypoint;
 
       /* convert incoming NAD27/CONUS coordinates to WGS84 */
       GPS_Math_Known_Datum_To_WGS84_M(
@@ -455,14 +455,14 @@ int tpo_find_block(unsigned int block_desired)
 //
 // For version 3.x files.
 //
-waypoint* tpo_convert_ll(int lat, int lon)
+Waypoint* tpo_convert_ll(int lat, int lon)
 {
   double latitude;
   double longitude;
-  waypoint* waypoint_temp;
+  Waypoint* waypoint_temp;
 
 
-  waypoint_temp = new waypoint;
+  waypoint_temp = new Waypoint;
 
   latitude = (double)lat / 0x800000;
   longitude = (double)lon / 0x800000;
@@ -705,7 +705,7 @@ void tpo_process_tracks(void)
     // Process the track bytes
     llvalid = 0;
     for (jj = 0; jj < track_byte_count;) {
-      waypoint* waypoint_temp;
+      Waypoint* waypoint_temp;
 
       // Time to read a new latlong?
       if (!llvalid) {
@@ -807,7 +807,7 @@ void tpo_process_tracks(void)
 //
 // For version 3.x files.
 //
-waypoint** tpo_wp_index;
+Waypoint** tpo_wp_index;
 unsigned int tpo_index_ptr;
 
 
@@ -836,7 +836,7 @@ void tpo_process_waypoints(void)
 
   // Fetch storage for the waypoint index (needed later for
   // routes)
-  tpo_wp_index = (waypoint**) xmalloc(sizeof(waypoint*) * waypoint_count);
+  tpo_wp_index = (Waypoint**) xmalloc(sizeof(Waypoint*) * waypoint_count);
   tpo_index_ptr = 0;
 
   if (waypoint_count == 0) {
@@ -845,8 +845,8 @@ void tpo_process_waypoints(void)
 
   // Read/process each waypoint in the file
   for (ii = 0; ii < waypoint_count; ii++) {
-    waypoint* waypoint_temp;
-    waypoint* waypoint_temp2;
+    Waypoint* waypoint_temp;
+    Waypoint* waypoint_temp2;
     unsigned int name_length;
     char* waypoint_name;
     int lat;
@@ -916,7 +916,7 @@ void tpo_process_waypoints(void)
 
     // For routes (later), we need a duplicate of each waypoint
     // indexed by the order we read them in.
-    waypoint_temp2 = new waypoint(*waypoint_temp);
+    waypoint_temp2 = new Waypoint(*waypoint_temp);
 
     // Attach the copy to our index
     tpo_wp_index[tpo_index_ptr++] = waypoint_temp2;
@@ -975,7 +975,7 @@ void tpo_process_map_notes(void)
     int lat;
     int lon;
     unsigned int name_length;
-    waypoint* waypoint_temp;
+    Waypoint* waypoint_temp;
     unsigned int num_bytes;
     unsigned int jj;
 
@@ -1110,7 +1110,7 @@ void tpo_process_symbols(void)
   for (ii = 0; ii < waypoint_count; ii++) {
     int lat;
     int lon;
-    waypoint* waypoint_temp;
+    Waypoint* waypoint_temp;
 
 
 //UNKNOWN DATA LENGTH
@@ -1172,7 +1172,7 @@ void tpo_process_text_labels(void)
     int lat;
     int lon;
     unsigned int name_length;
-    waypoint* waypoint_temp;
+    Waypoint* waypoint_temp;
 
 
 //UNKNOWN DATA LENGTH
@@ -1306,7 +1306,7 @@ void tpo_process_routes(void)
     // index, then add the waypoint to this route.
     //
     for (jj = 0; jj < waypoint_cnt; jj++) {
-      waypoint* waypoint_temp;
+      Waypoint* waypoint_temp;
       unsigned char val;
 
 
@@ -1316,7 +1316,7 @@ void tpo_process_routes(void)
 //printf("val: %x\t\t", val);
 
       // Duplicate a waypoint from our index of waypoints.
-      waypoint_temp = new waypoint(*tpo_wp_index[val-1]);
+      waypoint_temp = new Waypoint(*tpo_wp_index[val-1]);
 
       // Add the waypoint to the route
       route_add_wpt(route_temp, waypoint_temp);
@@ -1751,7 +1751,7 @@ tpo_track_hdr(const route_head* rte)
   unsigned char unknown1[] = { 0xFF, 0x00, 0x00, 0x00 };
   unsigned char bounding_box[8] = { 0x00, 0x80, 0x00, 0x80, 0xFF, 0x7F, 0xFF, 0x7F };
 
-  waypoint* first_track_waypoint = (waypoint*) QUEUE_FIRST(&rte->waypoint_list);
+  Waypoint* first_track_waypoint = (Waypoint*) QUEUE_FIRST(&rte->waypoint_list);
 
   /* zoom level 1-5 visibility flags */
   gbfwrite(visibility_flags, 1, sizeof(visibility_flags), tpo_file_out);
@@ -1809,7 +1809,7 @@ tpo_track_hdr(const route_head* rte)
 }
 
 static void
-tpo_track_disp(const waypoint* waypointp)
+tpo_track_disp(const Waypoint* waypointp)
 {
   double lat, lon, amt, x, y, z;
   short lat_delta, lon_delta;
index 3b11acb5de5cfbd3220642912b6d60b3ada8a8b8..c3729725821808664fade4ec2f4460429f9124c4 100644 (file)
@@ -276,8 +276,8 @@ trackfilter_init_qsort_cb(const void* a, const void* b)
 static int
 trackfilter_merge_qsort_cb(const void* a, const void* b)
 {
-  const waypoint* wa = *(waypoint**)a;
-  const waypoint* wb = *(waypoint**)b;
+  const Waypoint* wa = *(Waypoint**)a;
+  const Waypoint* wb = *(Waypoint**)b;
   const QDateTime dta = wa->GetCreationTime();
   const QDateTime dtb = wb->GetCreationTime();
 
@@ -324,7 +324,7 @@ static void
 trackfilter_fill_track_list_cb(const route_head* track)        /* callback for track_disp_all */
 {
   int i;
-  waypoint* wpt, *prev;
+  Waypoint* wpt, *prev;
   queue* elem, *tmp;
 
   if (track->rte_waypt_ct == 0) {
@@ -336,7 +336,7 @@ trackfilter_fill_track_list_cb(const route_head* track)     /* callback for track_d
     if ((track->rte_name == NULL) ||
         (case_ignore_str_match(CSTRc(track->rte_name), opt_name) == 0)) {
       QUEUE_FOR_EACH((queue*)&track->waypoint_list, elem, tmp) {
-        waypoint* wpt = (waypoint*)elem;
+        Waypoint* wpt = (Waypoint*)elem;
         track_del_wpt((route_head*)track, wpt);
         delete wpt;
       }
@@ -353,7 +353,7 @@ trackfilter_fill_track_list_cb(const route_head* track)     /* callback for track_d
   QUEUE_FOR_EACH((queue*)&track->waypoint_list, elem, tmp) {
     track_pts++;
 
-    wpt = (waypoint*)elem;
+    wpt = (Waypoint*)elem;
     if (!wpt->creation_time.isValid()) {
       timeless_pts++;
     }
@@ -419,12 +419,12 @@ trackfilter_pack_init_rte_name(route_head* track, const time_t default_time)
 
   if (strchr(opt_title, '%') != NULL) {
     struct tm tm;
-    waypoint* wpt;
+    Waypoint* wpt;
 
     if (track->rte_waypt_ct == 0) {
       tm = *localtime(&default_time);
     } else {
-      wpt = (waypoint*) QUEUE_FIRST((queue*)&track->waypoint_list);
+      wpt = (Waypoint*) QUEUE_FIRST((queue*)&track->waypoint_list);
       time_t t = wpt->GetCreationTime().toTime_t();
       tm = *localtime(&t);
     }
@@ -484,7 +484,7 @@ trackfilter_pack(void)
     route_head* curr = track_list[i].track;
 
     QUEUE_FOR_EACH((queue*)&curr->waypoint_list, elem, tmp) {
-      waypoint* wpt = (waypoint*)elem;
+      Waypoint* wpt = (Waypoint*)elem;
       track_del_wpt(curr, wpt);
       track_add_wpt(master, wpt);
     }
@@ -504,23 +504,23 @@ trackfilter_merge(void)
   int i, j, dropped;
 
   queue* elem, *tmp;
-  waypoint** buff;
-  waypoint* prev, *wpt;
+  Waypoint** buff;
+  Waypoint* prev, *wpt;
   route_head* master = track_list[0].track;
 
   if (track_pts-timeless_pts < 1) {
     return;
   }
 
-  buff = (waypoint**)xcalloc(track_pts-timeless_pts, sizeof(*buff));
+  buff = (Waypoint**)xcalloc(track_pts-timeless_pts, sizeof(*buff));
 
   j = 0;
   for (i = 0; i < track_ct; i++) {     /* put all points into temp buffer */
     route_head* track = track_list[i].track;
     QUEUE_FOR_EACH((queue*)&track->waypoint_list, elem, tmp) {
-      wpt = (waypoint*)elem;
+      wpt = (Waypoint*)elem;
       if (wpt->creation_time.isValid()) {
-        buff[j++] = new waypoint(*wpt);
+        buff[j++] = new Waypoint(*wpt);
       }
       track_del_wpt(track, wpt);
       delete wpt;
@@ -564,8 +564,8 @@ trackfilter_split(void)
   route_head* master = track_list[0].track;
   int count = master->rte_waypt_ct;
 
-  waypoint** buff;
-  waypoint* wpt;
+  Waypoint** buff;
+  Waypoint* wpt;
   queue* elem, *tmp;
   int i, j;
   double interval = -1;
@@ -674,11 +674,11 @@ trackfilter_split(void)
 
   trackfilter_split_init_rte_name(master, track_list[0].first_time);
 
-  buff = (waypoint**) xcalloc(count, sizeof(*buff));
+  buff = (Waypoint**) xcalloc(count, sizeof(*buff));
 
   i = 0;
   QUEUE_FOR_EACH((queue*)&master->waypoint_list, elem, tmp) {
-    wpt = (waypoint*)elem;
+    wpt = (Waypoint*)elem;
     buff[i++] = wpt;
   }
 
@@ -763,7 +763,7 @@ trackfilter_move(void)
 {
   int i;
   queue* elem, *tmp;
-  waypoint* wpt;
+  Waypoint* wpt;
   time_t delta;
 
   delta = trackfilter_parse_time_opt(opt_move);
@@ -774,7 +774,7 @@ trackfilter_move(void)
   for (i = 0; i < track_ct; i++) {
     route_head* track = track_list[i].track;
     QUEUE_FOR_EACH((queue*)&track->waypoint_list, elem, tmp) {
-      wpt = (waypoint*)elem;
+      wpt = (Waypoint*)elem;
       wpt->creation_time += delta;
     }
 
@@ -792,7 +792,7 @@ trackfilter_synth(void)
 {
   int i;
   queue* elem, *tmp;
-  waypoint* wpt;
+  Waypoint* wpt;
 
   double oldlat = -999;
   double oldlon = -999;
@@ -807,7 +807,7 @@ trackfilter_synth(void)
     route_head* track = track_list[i].track;
     first = 1;
     QUEUE_FOR_EACH((queue*)&track->waypoint_list, elem, tmp) {
-      wpt = (waypoint*)elem;
+      wpt = (Waypoint*)elem;
       if (opt_fix) {
         wpt->fix = fix;
         if (wpt->sat == 0) {
@@ -908,7 +908,7 @@ trackfilter_range(void)             /* returns number of track points left after filtering
     route_head* track = track_list[i].track;
 
     QUEUE_FOR_EACH((queue*)&track->waypoint_list, elem, tmp) {
-      waypoint* wpt = (waypoint*)elem;
+      Waypoint* wpt = (Waypoint*)elem;
       if (wpt->creation_time.isValid()) {
         inside = ((wpt->GetCreationTime().toTime_t() >= start) && (wpt->GetCreationTime().toTime_t() <= stop));
       }
@@ -955,7 +955,7 @@ trackfilter_seg2trk(void)
     int trk_seg_num = 1, first = 1;
 
     QUEUE_FOR_EACH((queue*)&src->waypoint_list, elem, tmp) {
-      waypoint* wpt = (waypoint*)elem;
+      Waypoint* wpt = (Waypoint*)elem;
       if (wpt->wpt_flags.new_trkseg && !first) {
 
         dest = route_head_alloc();
@@ -1006,7 +1006,7 @@ trackfilter_trk2seg(void)
 
     first = 1;
     QUEUE_FOR_EACH((queue*)&curr->waypoint_list, elem, tmp) {
-      waypoint* wpt = (waypoint*)elem;
+      Waypoint* wpt = (Waypoint*)elem;
 
 
       int orig_new_trkseg = wpt->wpt_flags.new_trkseg;
@@ -1110,7 +1110,7 @@ trackfilter_faketime(void)             /* returns number of track points left af
     route_head* track = track_list[i].track;
 
     QUEUE_FOR_EACH((queue*)&track->waypoint_list, elem, tmp) {
-      waypoint* wpt = (waypoint*)elem;
+      Waypoint* wpt = (Waypoint*)elem;
 
       if (opt_faketime != 0 && (!wpt->creation_time.isValid() || faketime.force)) {
         wpt->creation_time = QDateTime::fromTime_t(faketime.start);
@@ -1123,7 +1123,7 @@ trackfilter_faketime(void)             /* returns number of track points left af
 }
 
 static int
-trackfilter_points_are_same(const waypoint* wpta, const waypoint* wptb)
+trackfilter_points_are_same(const Waypoint* wpta, const Waypoint* wptb)
 {
   // We use a simpler (non great circle) test for lat/lon here as this
   // is used for keeping the 'bookends' of non-moving points.
@@ -1152,13 +1152,13 @@ trackfilter_segment_head(const route_head* rte)
   queue* elem, *tmp;
   double avg_dist = 0;
   int index = 0;
-  waypoint* prev_wpt = NULL;
+  Waypoint* prev_wpt = NULL;
   // Consider tossing trackpoints closer than this in radians.
   // (Empirically determined; It's a few dozen feet.)
   const double ktoo_close = 0.000005;
 
   QUEUE_FOR_EACH(&rte->waypoint_list, elem, tmp) {
-    waypoint* wpt = (waypoint*)elem;
+    Waypoint* wpt = (Waypoint*)elem;
     if (index > 0) {
       double cur_dist = gcdist(RAD(prev_wpt->latitude),
                                RAD(prev_wpt->longitude),
@@ -1170,8 +1170,8 @@ trackfilter_segment_head(const route_head* rte)
       }
 
       if (cur_dist < ktoo_close) {
-        if (wpt != (waypoint*) QUEUE_LAST(&rte->waypoint_list)) {
-          waypoint* next_wpt = (waypoint*) QUEUE_NEXT(&wpt->Q);
+        if (wpt != (Waypoint*) QUEUE_LAST(&rte->waypoint_list)) {
+          Waypoint* next_wpt = (Waypoint*) QUEUE_NEXT(&wpt->Q);
           if (trackfilter_points_are_same(prev_wpt, wpt) &&
               trackfilter_points_are_same(wpt, next_wpt)) {
             track_del_wpt((route_head*)rte, wpt);
index af5b79e83aca92ec1f3c2294d9815c235ddb44d2..be048b4b46e06a01d2b2bee3bcfc21a0537b3d46 100644 (file)
@@ -88,14 +88,14 @@ transform_waypoints(void)
     break;
   }
 #if NEWQ
-  foreach(waypoint* wpt, waypt_list) {
+  foreach(Waypoint* wpt, waypt_list) {
 #else
   queue* elem, *tmp;
   QUEUE_FOR_EACH(&waypt_head, elem, tmp) {
-    waypoint* wpt = (waypoint*) elem;
+    Waypoint* wpt = (Waypoint*) elem;
 #endif
 
-    wpt = new waypoint(*wpt);
+    wpt = new Waypoint(*wpt);
     switch (current_target) {
     case 'R':
       route_add_wpt_named(rte, wpt, RPT, name_digits);
@@ -151,9 +151,9 @@ transform_trk_disp_hdr_cb(const route_head* trk)
 }
 
 static void
-transform_any_disp_wpt_cb(const waypoint* wpt)
+transform_any_disp_wpt_cb(const Waypoint* wpt)
 {
-  waypoint* temp = new waypoint(*wpt);
+  Waypoint* temp = new Waypoint(*wpt);
   if (current_target == 'R') {
     route_add_wpt_named(current_rte, temp, current_namepart, name_digits);
   } else if (current_target == 'T') {
index bb23dbb41040e628f88578a41027c4170b5b9ac9..7b73b29fd26e71139f467cb09a13f76e8c3e4a8c 100644 (file)
@@ -633,7 +633,7 @@ static void
 unicsv_parse_one_line(char* ibuf)
 {
   char* s;
-  waypoint* wpt = NULL;
+  Waypoint* wpt = NULL;
   int column;
   int  utm_zone = -9999;
   double utm_easting = 0;
@@ -655,7 +655,7 @@ unicsv_parse_one_line(char* ibuf)
   int ns = 1;
   int ew = 1;
   geocache_data* gc_data = NULL;
-  wpt = new waypoint;
+  wpt = new Waypoint;
   wpt->latitude = unicsv_unknown;
   wpt->longitude = unicsv_unknown;
   memset(&ymd, 0, sizeof(ymd));
@@ -1238,7 +1238,7 @@ unicsv_rd(void)
 /* =========================================================================== */
 
 static void
-unicsv_fatal_outside(const waypoint* wpt)
+unicsv_fatal_outside(const Waypoint* wpt)
 {
   gbfprintf(fout, "#####\n");
   fatal(MYNAME ": %s (%s) is outside of convertable area of grid \"%s\"!\n",
@@ -1287,7 +1287,7 @@ unicsv_print_data_time(const QDateTime& idt)
 #define FIELD_USED(a) (gb_getbit(&unicsv_outp_flags, a))
 
 static void
-unicsv_waypt_enum_cb(const waypoint* wpt)
+unicsv_waypt_enum_cb(const Waypoint* wpt)
 {
   garmin_fs_t* gmsd;
 
@@ -1448,7 +1448,7 @@ unicsv_waypt_enum_cb(const waypoint* wpt)
 }
 
 static void
-unicsv_waypt_disp_cb(const waypoint* wpt)
+unicsv_waypt_disp_cb(const Waypoint* wpt)
 {
   double lat, lon, alt;
   char* cout = NULL;
index 891cf3381dbe6bf528dd65b3c175ca677b25357e..df4b87f4d8674aa8bd5f2254974c04fde964af07 100644 (file)
@@ -875,7 +875,7 @@ void dotnet_time_to_time_t(double dotnet, time_t* t, int* millisecs)
  * formats do lookups based on these strings.
  */
 const char*
-get_cache_icon(const waypoint* waypointp)
+get_cache_icon(const Waypoint* waypointp)
 {
   if (!global_opts.smart_icons) {
     return NULL;
index 3c17b6676df8107faf041a7a76b5285c97c537e2..fdf6568038e7d9bc8456d255b6f386ae2950dc03 100644 (file)
@@ -241,7 +241,7 @@ v900_read(void)
   track_add_head(track);
 
   while (1) {
-    waypoint* wpt;
+    Waypoint* wpt;
     char c;
     int bad = 0;
     int record_len = is_advanced_mode ? sizeof(line.adv) : sizeof(line.bas);
@@ -300,7 +300,7 @@ v900_read(void)
       line.bas.cr = 0; /* null terminate vox field */
     }
 
-    wpt = new waypoint;
+    wpt = new Waypoint;
 
     /* lat is a string in the form: 31.768380N */
     c = line.bas.common.latitude_NS;   /* N/S */
@@ -356,13 +356,13 @@ v900_read(void)
 
     track_add_wpt(track, wpt);
     if (line.bas.common.tag != 'T') {
-      waypoint* wpt2;
+      Waypoint* wpt2;
       // A 'G' tag appears to be a 'T' tag, but generated on the trailing
       // edge of a DGPS fix as it decays to an SPS fix.  See 1/13/13 email
       // thread on gpsbabel-misc with Jamie Robertson.
       assert(line.bas.common.tag == 'C' || line.bas.common.tag == 'G' ||
              line.bas.common.tag == 'V');
-      wpt2 = new waypoint(*wpt);
+      wpt2 = new Waypoint(*wpt);
       if (line.bas.common.tag == 'V') {        // waypoint with voice recording?
         char vox_file_name[sizeof(line.adv.vox)+5];
         const char* vox = is_advanced_mode ? line.adv.vox : line.bas.vox;
index 8cc9f24f73631adf0a863393b5c1b674098edcbf..b15a714ea89c3135460bbe76aead35778aa078d6 100644 (file)
@@ -66,7 +66,7 @@ static void validate_head_trl(const route_head* header)
   }
 }
 
-static void validate_point(const waypoint* waypointp)
+static void validate_point(const Waypoint* waypointp)
 {
   point_ct += 1;
 }
index e1fb68d429d9165a0e3bed6aa0646d18bfa62cff..a2387e13ec8f309dec1631938b607109ce9d8cd6 100644 (file)
@@ -95,7 +95,7 @@ vcf_print(const char* s)
 }
 
 static void
-vcf_disp(const waypoint* wpt)
+vcf_disp(const Waypoint* wpt)
 {
   int latint, lonint;
 
index 335ec6ad109a4853aa7861408de10068437ae45f..8ecc9cb4ee6098af403b54266ffd348ea95d5773 100644 (file)
@@ -77,7 +77,7 @@ vidaone_read(void)
   route_head* trk = NULL;
 
   while (! gbfeof(fin)) {
-    waypoint* wpt = new waypoint;
+    Waypoint* wpt = new Waypoint;
 
     wpt->latitude = gbfgetdbl(fin);
     wpt->longitude = gbfgetdbl(fin);
@@ -114,7 +114,7 @@ vidaone_wr_deinit(void)
 }
 
 static void
-vidaone_trkpt(const waypoint* wpt)
+vidaone_trkpt(const Waypoint* wpt)
 {
   gbfputdbl(wpt->latitude, fout);
   gbfputdbl(wpt->longitude, fout);
index 131e4830419c606c0af2ac270395faadd5797315..3d8582158b13b93e930283ada8b5c2b225946f9e 100644 (file)
@@ -77,7 +77,7 @@ vitosmt_read(void)
   long                 check2                  =-2;
   long                 check3                  =-3;
   route_head*          route_head              =0;
-  waypoint*            wpt_tmp         =0;
+  Waypoint*            wpt_tmp         =0;
   double                       latrad                  =0;
   double                       lonrad                  =0;
   double                       elev                    =0;
@@ -154,7 +154,7 @@ vitosmt_read(void)
     gpsvalid   =gbfgetc(infile);       /* fix is valid */
     gpssats            =gbfgetc(infile);       /* number of sats */
 
-    wpt_tmp = new waypoint;
+    wpt_tmp = new Waypoint;
 
     wpt_tmp->latitude  =DEG(latrad);
     wpt_tmp->longitude =DEG(lonrad);
@@ -241,7 +241,7 @@ wr_deinit(void)
 }
 
 static void
-vitosmt_waypt_pr(const waypoint* waypointp)
+vitosmt_waypt_pr(const Waypoint* waypointp)
 {
   unsigned char*       workbuffer              =0;
   size_t                       position                =0;
index f672b9a8f11a6aab27d4b9d7ad71f1b61e025d0f..0157311134f143176be4014e81f5fd1c9f031c54 100644 (file)
@@ -63,7 +63,7 @@ vitovtt_read(void)
 {
   int                          version                 = 0;
   route_head*          route_head              = 0;
-  waypoint*            wpt_tmp         = 0;
+  Waypoint*            wpt_tmp         = 0;
   int                          scaled_lat              = 0;
   int                          scaled_lon              = 0;
   double                       altitude                = 0;
@@ -103,7 +103,7 @@ vitovtt_read(void)
     course                             = gbfgetint16(infile);
     status                             = gbfgetint32(infile);
 
-    wpt_tmp = new waypoint;
+    wpt_tmp = new Waypoint;
 
     wpt_tmp->latitude  = scaled_lat / vitovtt_latitudescale;
     wpt_tmp->longitude = scaled_lon / vitovtt_longitudescale;
index 97abf82ee191762b5a217d0a03579be30260bdd7..c8fb387c32d9386972bb3867009f85ac9a452e31 100644 (file)
@@ -174,7 +174,7 @@ vpl_parse_75_sentence(const char* ibuf)
   int16_t alt, speed_raw;
   uint16_t hdg_raw;
   uint8_t sats, hdop_raw, vdop_raw;
-  waypoint* waypt;
+  Waypoint* waypt;
   struct tm tm;
 
   // The files have DOS line endings (CR/LF) but we don't care, because we
@@ -195,7 +195,7 @@ vpl_parse_75_sentence(const char* ibuf)
   ymd /= 100;
   tm.tm_year = ymd % 100 + 100;
 
-  waypt = new waypoint;
+  waypt = new Waypoint;
 
   // Lat/Lon are both stored *0xE1000 which we have to divide out
   // for decimal degrees
index 3f0071b9581aa9edf7e6c6cf84c84a657489adba..3abaceb048eb2e3367fc076799f7a4b6aabd59cb 100644 (file)
@@ -31,7 +31,7 @@
 #include "session.h"
 
 #if NEWQ
-QList<waypoint*> waypt_list;
+QList<Waypoint*> waypt_list;
 queue waypt_head; // This is here solely to freak out the formats that are
 // looking into what should be a private members.
 #else
@@ -40,7 +40,7 @@ queue waypt_head;
 
 static unsigned int waypt_ct;
 static short_handle mkshort_handle;
-geocache_data waypoint::empty_gc_data;
+geocache_data Waypoint::empty_gc_data;
 static global_trait traits;
 
 const global_trait* get_traits(void)
@@ -59,7 +59,7 @@ waypt_init(void)
 #endif
 }
 
-void update_common_traits(const waypoint* wpt)
+void update_common_traits(const Waypoint* wpt)
 {
   /* This is a bit tacky, but it allows a hint whether we've seen
    * this data or not in the life cycle of this run.   Of course,
@@ -76,7 +76,7 @@ void update_common_traits(const waypoint* wpt)
 }
 
 void
-waypt_add(waypoint* wpt)
+waypt_add(Waypoint* wpt)
 {
   double lat_orig = wpt->latitude;
   double lon_orig = wpt->longitude;
@@ -142,7 +142,7 @@ waypt_add(waypoint* wpt)
 }
 
 void
-waypt_del(waypoint* wpt)
+waypt_del(Waypoint* wpt)
 {
 #if NEWQ
 #else
@@ -168,7 +168,7 @@ set_waypt_count(unsigned int nc)
 }
 
 void
-waypt_disp(const waypoint* wpt)
+waypt_disp(const Waypoint* wpt)
 {
   if (wpt->GetCreationTime().isValid()) {
     printf("%s ", qPrintable(wpt->creation_time.toString()));
@@ -215,12 +215,12 @@ waypt_disp_session(const session_t* se, waypt_cb cb)
 {
   int i = 0;
 #if NEWQ
-  foreach(waypoint* waypointp, waypt_list) {
+  foreach(Waypoint* waypointp, waypt_list) {
 #else
   queue* elem, *tmp;
-  waypoint* waypointp;
+  Waypoint* waypointp;
   QUEUE_FOR_EACH(&waypt_head, elem, tmp) {
-    waypointp = (waypoint*) elem;
+    waypointp = (Waypoint*) elem;
 #endif
     if ((se == NULL) || (waypointp->session == se)) {
       if (global_opts.verbose_status) {
@@ -258,7 +258,7 @@ waypt_bounds_valid(bounds* bounds)
  * Recompund bounding box based on new position point.
  */
 void
-waypt_add_to_bounds(bounds* bounds, const waypoint* waypointp)
+waypt_add_to_bounds(bounds* bounds, const Waypoint* waypointp)
 {
   if (waypointp->latitude > bounds->max_lat) {
     bounds->max_lat = waypointp->latitude;
@@ -293,28 +293,28 @@ waypt_compute_bounds(bounds* bounds)
 {
   waypt_init_bounds(bounds);
 #if NEWQ
-  foreach(waypoint* waypointp, waypt_list) {
+  foreach(Waypoint* waypointp, waypt_list) {
 #else
   queue* elem, *tmp;
-  waypoint* waypointp;
+  Waypoint* waypointp;
   QUEUE_FOR_EACH(&waypt_head, elem, tmp) {
-    waypointp = (waypoint*) elem;
+    waypointp = (Waypoint*) elem;
 #endif
     waypt_add_to_bounds(bounds, waypointp);
   }
 }
 
-waypoint*
+Waypoint*
 find_waypt_by_name(const QString& name)
 {
 #if NEWQ
-  foreach(waypoint* waypointp, waypt_list) {
+  foreach(Waypoint* waypointp, waypt_list) {
 #else
   queue* elem, *tmp;
-  waypoint* waypointp;
+  Waypoint* waypointp;
 
   QUEUE_FOR_EACH(&waypt_head, elem, tmp) {
-    waypointp = (waypoint*) elem;
+    waypointp = (Waypoint*) elem;
 #endif
     if (waypointp->shortname == name) {
       return waypointp;
@@ -339,7 +339,7 @@ waypt_flush(queue* head)
   queue* elem, *tmp;
 
   QUEUE_FOR_EACH(head, elem, tmp) {
-    waypoint* q = (waypoint*) dequeue(elem);
+    Waypoint* q = (Waypoint*) dequeue(elem);
     delete q;
     if (head == &waypt_head) {
       waypt_ct--;
@@ -364,7 +364,7 @@ void
 waypt_backup(signed int* count, queue** head_bak)
 {
   queue* elem, *tmp, *qbackup;
-  waypoint* wpt;
+  Waypoint* wpt;
   int no = 0;
 
   qbackup = (queue*) xcalloc(1, sizeof(*qbackup));
@@ -380,8 +380,8 @@ waypt_backup(signed int* count, queue** head_bak)
   waypt_ct = 0;
 
   QUEUE_FOR_EACH(qbackup, elem, tmp) {
-    wpt = (waypoint*)elem;
-    waypt_add(new waypoint(*wpt));
+    wpt = (Waypoint*)elem;
+    waypt_add(new Waypoint(*wpt));
     no++;
   }
 
@@ -408,7 +408,7 @@ waypt_restore(signed int count, queue* head_bak)
 }
 
 void
-waypt_add_url(waypoint* wpt, const QString& link, const QString& url_link_text)
+waypt_add_url(Waypoint* wpt, const QString& link, const QString& url_link_text)
 {
   wpt->url_link_list_.push_back(UrlLink(link, url_link_text));
 }
@@ -432,7 +432,7 @@ gcgeodist(const double lat1, const double lon1,
  */
 
 double
-waypt_time(const waypoint* wpt)
+waypt_time(const Waypoint* wpt)
 {
   if (!wpt->creation_time.isValid()) {
     return (double) 0;
@@ -448,7 +448,7 @@ waypt_time(const waypoint* wpt)
  */
 
 double
-waypt_distance_ex(const waypoint* A, const waypoint* B)
+waypt_distance_ex(const Waypoint* A, const Waypoint* B)
 {
   double res = 0;
   garmin_fs_p gmsd;
@@ -475,7 +475,7 @@ waypt_distance_ex(const waypoint* A, const waypoint* B)
 }
 
 double
-waypt_distance(const waypoint* A, const waypoint* B)
+waypt_distance(const Waypoint* A, const Waypoint* B)
 {
   if ((A == NULL) || (B == NULL)) {
     return 0;
@@ -491,7 +491,7 @@ waypt_distance(const waypoint* A, const waypoint* B)
  */
 
 double
-waypt_speed_ex(const waypoint* A, const waypoint* B)
+waypt_speed_ex(const Waypoint* A, const Waypoint* B)
 {
   double dist, time;
 
@@ -514,7 +514,7 @@ waypt_speed_ex(const waypoint* A, const waypoint* B)
  */
 
 double
-waypt_speed(const waypoint* A, const waypoint* B)
+waypt_speed(const Waypoint* A, const Waypoint* B)
 {
   double dist, time;
 
@@ -535,7 +535,7 @@ waypt_speed(const waypoint* A, const waypoint* B)
  * Calculates "Course True" from A to B
  */
 double
-waypt_course(const waypoint* A, const waypoint* B)
+waypt_course(const Waypoint* A, const Waypoint* B)
 {
   if (A && B) {
     return heading_true_degrees(RAD(A->latitude), RAD(A->longitude), RAD(B->latitude), RAD(B->longitude));
@@ -544,7 +544,7 @@ waypt_course(const waypoint* A, const waypoint* B)
   }
 }
 
-waypoint::waypoint() :
+Waypoint::Waypoint() :
   // Q(),
   latitude(0),  // These should probably use some invalid data, but
   longitude(0), // it looks like we have code that relies on them being zero.
@@ -573,7 +573,7 @@ waypoint::waypoint() :
   power(0),
   temperature(0),
   odometer_distance(0),
-  gc_data(&waypoint::empty_gc_data),
+  gc_data(&Waypoint::empty_gc_data),
   fs(NULL),
   session(curr_session()),
   extra_data(NULL)
@@ -581,15 +581,15 @@ waypoint::waypoint() :
   QUEUE_INIT(&Q);
 }
 
-waypoint::~waypoint()
+Waypoint::~Waypoint()
 {
-  if (gc_data != &waypoint::empty_gc_data) {
+  if (gc_data != &Waypoint::empty_gc_data) {
     delete gc_data;
   }
   fs_chain_destroy(fs);
 }
 
-waypoint::waypoint(const waypoint& other) :
+Waypoint::Waypoint(const Waypoint& other) :
   // Q(other.Q),
   latitude(other.latitude),
   longitude(other.longitude),
@@ -622,7 +622,7 @@ waypoint::waypoint(const waypoint& other) :
   extra_data(other.extra_data)
 {
   // deep copy geocache data unless it is the specail static empty_gc_data.
-  if (other.gc_data != &waypoint::empty_gc_data) {
+  if (other.gc_data != &Waypoint::empty_gc_data) {
     gc_data = new geocache_data(*other.gc_data);
   }
 
@@ -639,7 +639,7 @@ waypoint::waypoint(const waypoint& other) :
   // note: extra_data is not deep copied.
 }
 
-waypoint& waypoint::operator=(const waypoint& other)
+Waypoint& Waypoint::operator=(const Waypoint& other)
 {
   // the default assignment operator is not appropriate as we do deep copy of some members,
   // and we haven't bothered to write an appropriate one.
@@ -648,31 +648,31 @@ waypoint& waypoint::operator=(const waypoint& other)
 }
 
 bool
-waypoint::HasUrlLink() const
+Waypoint::HasUrlLink() const
 {
   return !url_link_list_.isEmpty();
 }
 
 const UrlLink&
-waypoint::GetUrlLink() const
+Waypoint::GetUrlLink() const
 {
   return url_link_list_[0];
 }
 
 const QList<UrlLink>
-waypoint::GetUrlLinks() const
+Waypoint::GetUrlLinks() const
 {
   return url_link_list_;
 }
 
 void
-waypoint::AddUrlLink(const UrlLink l)
+Waypoint::AddUrlLink(const UrlLink l)
 {
   url_link_list_.push_back(l);
 }
 
 QString
-waypoint::CreationTimeXML() const
+Waypoint::CreationTimeXML() const
 {
   if (!creation_time.isValid()) {
     return NULL;
@@ -690,41 +690,41 @@ waypoint::CreationTimeXML() const
 }
 
 gpsbabel::DateTime
-waypoint::GetCreationTime() const
+Waypoint::GetCreationTime() const
 {
   return creation_time;
 }
 
 void
-waypoint::SetCreationTime(gpsbabel::DateTime t)
+Waypoint::SetCreationTime(gpsbabel::DateTime t)
 {
   creation_time = t;
 }
 
 void
-waypoint::SetCreationTime(time_t t)
+Waypoint::SetCreationTime(time_t t)
 {
   creation_time = QDateTime::fromTime_t(t);
 }
 
 void
-waypoint::SetCreationTime(time_t t, int ms)
+Waypoint::SetCreationTime(time_t t, int ms)
 {
   creation_time.setTime_t(t);
   creation_time = creation_time.addMSecs(ms);
 }
 
 geocache_data*
-waypoint::AllocGCData()
+Waypoint::AllocGCData()
 {
-  if (gc_data == &waypoint::empty_gc_data) {
+  if (gc_data == &Waypoint::empty_gc_data) {
     gc_data = new geocache_data;
   }
   return gc_data;
 }
 
 int
-waypoint::EmptyGCData() const
+Waypoint::EmptyGCData() const
 {
-  return (gc_data == &waypoint::empty_gc_data);
+  return (gc_data == &Waypoint::empty_gc_data);
 }
index 8c02e84376d5e085853b2257d89828057d58cbd7..f9ef2a6c493e182e6f6e8001a4a5a570cd112241 100644 (file)
@@ -540,10 +540,10 @@ static int check_date(uint32_t tim)
          mday > 0 && mday <= 31 && mon > 0 && mon <= 12 && year >= 4;
 }
 
-static waypoint* make_point(double lat, double lon, double alt, time_t tim, const char* fmt, int index)
+static Waypoint* make_point(double lat, double lon, double alt, time_t tim, const char* fmt, int index)
 {
   char     wp_name[20];
-  waypoint* wpt = new waypoint;
+  Waypoint* wpt = new Waypoint;
 
   sprintf(wp_name, fmt, index);
 
@@ -556,12 +556,12 @@ static waypoint* make_point(double lat, double lon, double alt, time_t tim, cons
   return wpt;
 }
 
-static waypoint* make_waypoint(struct read_state* st, double lat, double lon, double alt, time_t tim)
+static Waypoint* make_waypoint(struct read_state* st, double lat, double lon, double alt, time_t tim)
 {
   return make_point(lat, lon, alt, tim, "WP%04d", ++st->wpn);
 }
 
-static waypoint* make_trackpoint(struct read_state* st, double lat, double lon, double alt, time_t tim)
+static Waypoint* make_trackpoint(struct read_state* st, double lat, double lon, double alt, time_t tim)
 {
   return make_point(lat, lon, alt, tim, "TP%04d", ++st->tpn);
 }
@@ -571,7 +571,7 @@ static int wbt200_data_chunk(struct read_state* st, const void* buf, int fmt)
   uint32_t   tim;
   double     lat, lon, alt;
   time_t     rtim;
-  waypoint*   tpt     = NULL;
+  Waypoint*   tpt     = NULL;
   const char* bp      = (const char*) buf;
   size_t     buf_used = fmt_version[fmt].reclen;
 
@@ -808,7 +808,7 @@ static int wbt201_data_chunk(struct read_state* st, const void* buf)
   uint16_t    flags;
   double      lat, lon, alt;
   time_t      rtim;
-  waypoint*    tpt     = NULL;
+  Waypoint*    tpt     = NULL;
   const char*  bp      = (const char*) buf;
 
   /* Zero records are skipped */
@@ -831,7 +831,7 @@ static int wbt201_data_chunk(struct read_state* st, const void* buf)
   rtim = decode_date(tim);
 
   if ((flags & WBT201_WAYPOINT) && (global_opts.masked_objective & WPTDATAMASK)) {
-    waypoint* wpt = make_waypoint(st, lat, lon, alt, rtim);
+    Waypoint* wpt = make_waypoint(st, lat, lon, alt, rtim);
     waypt_add(wpt);
   }
 
index 48721d3418072b3fea3715243a0da1f7431b1bc4..71a9bf28c6974773ac3b1578ac04135ee6e665e6 100644 (file)
@@ -219,11 +219,11 @@ static long tosscount=0;
 
 void wfff_e(xg_string args, const QXmlStreamAttributes* unused)
 {
-  waypoint*    wpt_tmp         =0;
+  Waypoint*    wpt_tmp         =0;
   char         desc[255]       ="\0";
 
   if ((ap_hdop>=1)&&(ap_hdop<50)) { // Discard invalid GPS fix
-    wpt_tmp = new waypoint;
+    wpt_tmp = new Waypoint;
 
     if (snmac) {
       wpt_tmp->shortname = ap_mac;
index 1348e464f181c9885937a2c4a1b568001d3d8759..0f1f965876465e692e27b75649ba0bde660ca5ca 100644 (file)
@@ -60,7 +60,7 @@ wintec_tes_read(void)
   track_add_head(trk);
 
   while (!gbfeof(fin)) {
-    waypoint* wpt;
+    Waypoint* wpt;
     uint16_t flags = gbfgetuint16(fin);
     uint32_t date = gbfgetuint32(fin);
     int32_t latitude = gbfgetint32(fin);
@@ -68,7 +68,7 @@ wintec_tes_read(void)
     int16_t alt = gbfgetint16(fin);  // Signed.  Meters.
 
     (void) flags; // Silence 'unused' warning until we use flags.
-    wpt = new waypoint;
+    wpt = new Waypoint;
     wpt->latitude = latitude / 1.0e7;
     wpt->longitude = longitude / 1.0e7;
     wpt->SetCreationTime(wintec_date_to_time(date));
@@ -85,7 +85,7 @@ wintec_tes_read(void)
     //  Wintec's software puts a waypoint in the track, so we
     //  mock that.
     if (flags &  0x02) {
-      waypoint* temp = new waypoint(*wpt);
+      Waypoint* temp = new Waypoint(*wpt);
       waypt_add(temp);
     }
 
index cfbc84ac03155eb2b48df0dad8684f0f4cbb4afc..b1d9e84cbfa5b0bc0f01f94d02ee539e66f171d8 100644 (file)
@@ -699,7 +699,7 @@ xcsv_wr_position_deinit(void)
 
 
 static void
-xcsv_wr_position(waypoint* wpt)
+xcsv_wr_position(Waypoint* wpt)
 {
   /* Tweak incoming name if we don't have a fix */
   switch (wpt->fix) {
index 352957db9074ed14ddfb021b908af5ead5fd3eff..adb4e46368f8af3a610e6fb6e41f169039134022 100644 (file)
@@ -27,7 +27,7 @@
 #include "jeeps/gpsmath.h"
 #include "garmin_tables.h"
 
-static waypoint* wpt;
+static Waypoint* wpt;
 static route_head* trk;
 static gbfile* fout;
 static int space;
@@ -70,7 +70,7 @@ xol_shape(xg_string args, const QXmlStreamAttributes* attrv)
 {
   if (attrv->hasAttribute("type")) {
     if (attrv->value("type") == "waypoint") {
-      wpt = new waypoint;
+      wpt = new Waypoint;
     } else if (attrv->value("type") == "polyline") {
       trk = route_head_alloc();
       track_add_head(trk);
@@ -162,7 +162,7 @@ xol_rd_deinit(void)
 /* writer */
 
 static void
-xol_fatal_outside(const waypoint* wpt)
+xol_fatal_outside(const Waypoint* wpt)
 {
   gbfprintf(fout, "#####\n");
   fatal(MYNAME ": %s (%s) is outside of convertable area \"%s\"!\n",
@@ -177,7 +177,7 @@ xol_fatal_outside(const waypoint* wpt)
 
 
 static void
-xol_write_time(const waypoint* wpt)
+xol_write_time(const Waypoint* wpt)
 {
   QString time_string = wpt->CreationTimeXML();
   if (!time_string.isEmpty()) {
@@ -195,7 +195,7 @@ xol_write_string(const QString& name, const QString& str)
 }
 
 static void
-xol_waypt_bound_calc(const waypoint* wpt)
+xol_waypt_bound_calc(const Waypoint* wpt)
 {
   waypt_add_to_bounds(&all_bounds, wpt);
 }
@@ -226,7 +226,7 @@ xol_wr_deinit(void)
 }
 
 static void
-xol_waypt_disp_cb(const waypoint* wpt)
+xol_waypt_disp_cb(const Waypoint* wpt)
 {
   double x, y;
 
@@ -276,7 +276,7 @@ xol_track_tlr_disp_cb(const route_head* trk)
 }
 
 static void
-xol_trkpt_disp_cb(const waypoint* wpt)
+xol_trkpt_disp_cb(const Waypoint* wpt)
 {
   double x, y;
 
index ce153cc3ba318f9d3afc51edf275f9322dfba21f..64f5841b09a12bad1851363cee3ae3588923cd85 100644 (file)
@@ -24,7 +24,7 @@
 #include "defs.h"
 #include "xmlgeneric.h"
 
-static waypoint* wpt_tmp;
+static Waypoint* wpt_tmp;
 static char* as;
 
 #define MYNAME "yahoo"
@@ -81,7 +81,7 @@ yahoo_wr_init(const char* fname)
 
 void   wpt_s(xg_string args, const QXmlStreamAttributes* unused)
 {
-  wpt_tmp = new waypoint;
+  wpt_tmp = new Waypoint;
 }
 
 void   wpt_e(xg_string args, const QXmlStreamAttributes* unused)